From: Gurucharan Shetty <gshetty@nicira.com>
Date: Wed, 12 Mar 2014 17:50:42 +0000 (-0700)
Subject: netdev-vport: Don't look for ovs-monitor-ipsec's pid file.
X-Git-Tag: v2.3~529
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=c89809c9fb667ea1be41bd4e182e3a6dc9e43e03;p=cascardo%2Fovs.git

netdev-vport: Don't look for ovs-monitor-ipsec's pid file.

We do not have pidfiles in Windows. And we do not yet have support
for ipsec tunnels. This lets us move forward with compilation.

Signed-off-by: Gurucharan Shetty <gshetty@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c
index 165c1c661..f52cceb1d 100644
--- a/lib/netdev-vport.c
+++ b/lib/netdev-vport.c
@@ -433,6 +433,7 @@ set_tunnel_config(struct netdev *dev_, const struct smap *args)
         static struct ovs_mutex mutex = OVS_MUTEX_INITIALIZER;
         static pid_t pid = 0;
 
+#ifndef _WIN32
         ovs_mutex_lock(&mutex);
         if (pid <= 0) {
             char *file_name = xasprintf("%s/%s", ovs_rundir(),
@@ -441,6 +442,7 @@ set_tunnel_config(struct netdev *dev_, const struct smap *args)
             free(file_name);
         }
         ovs_mutex_unlock(&mutex);
+#endif
 
         if (pid < 0) {
             VLOG_ERR("%s: IPsec requires the ovs-monitor-ipsec daemon",