<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ggsn/+/17803">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">lib/netns: OSMO_ASSER() if user doesn't call init_netns()<br><br>It is vital that init_netns() is called first in order to initialize<br>default_nsfd.<br><br>Change-Id: Ic16646fa7d60c578056b17351c5fe2090a81dff0<br>---<br>M lib/netns.c<br>1 file changed, 13 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/03/17803/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/lib/netns.c b/lib/netns.c</span><br><span>index 8d26330..914f5c8 100644</span><br><span>--- a/lib/netns.c</span><br><span>+++ b/lib/netns.c</span><br><span>@@ -41,12 +41,14 @@</span><br><span> #include <fcntl.h></span><br><span> #include <errno.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/utils.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #include "netns.h"</span><br><span> </span><br><span> #define NETNS_PATH "/var/run/netns"</span><br><span> </span><br><span> /*! default namespace of the GGSN process */</span><br><span style="color: hsl(0, 100%, 40%);">-static int default_nsfd;</span><br><span style="color: hsl(120, 100%, 40%);">+static int default_nsfd = -1;</span><br><span> </span><br><span> /*! switch to a (non-default) namespace, store existing signal mask in oldmask.</span><br><span>  *  \param[in] nsfd file descriptor representing the namespace to whch we shall switch</span><br><span>@@ -57,6 +59,8 @@</span><br><span>      sigset_t intmask;</span><br><span>    int rc;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+   OSMO_ASSERT(default_nsfd >= 0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>         if (sigfillset(&intmask) < 0)</span><br><span>                 return -errno;</span><br><span>       if ((rc = sigprocmask(SIG_BLOCK, &intmask, oldmask)) != 0)</span><br><span>@@ -75,6 +79,8 @@</span><br><span>  *  \returns 0 on successs; negative errno value in case of error */</span><br><span> int restore_ns(sigset_t *oldmask)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+  OSMO_ASSERT(default_nsfd >= 0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>         int rc;</span><br><span>      if (setns(default_nsfd, CLONE_NEWNET) < 0)</span><br><span>                return -errno;</span><br><span>@@ -92,6 +98,8 @@</span><br><span>   int fd = -1;</span><br><span>         int rc;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+   OSMO_ASSERT(default_nsfd >= 0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>         /* mask off all signals, store old signal mask */</span><br><span>    if (sigfillset(&intmask) < 0)</span><br><span>                 return -errno;</span><br><span>@@ -144,6 +152,8 @@</span><br><span>         int sk = -1;</span><br><span>         int rc;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+   OSMO_ASSERT(default_nsfd >= 0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>         /* mask off all signals, store old signal mask */</span><br><span>    if (sigfillset(&intmask) < 0)</span><br><span>                 return -errno;</span><br><span>@@ -204,6 +214,8 @@</span><br><span>         sigset_t intmask, oldmask;</span><br><span>   char path[MAXPATHLEN] = NETNS_PATH;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+       OSMO_ASSERT(default_nsfd >= 0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>         /* create /var/run/netns, if it doesn't exist already */</span><br><span>         rc = mkdir(path, S_IRWXU|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH);</span><br><span>   if (rc < 0 && errno != EEXIST)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ggsn/+/17803">change 17803</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-ggsn/+/17803"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-ggsn </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ic16646fa7d60c578056b17351c5fe2090a81dff0 </div>
<div style="display:none"> Gerrit-Change-Number: 17803 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>