<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ggsn/+/17812">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sgsnemu: Avoid adding extra autogenerated local link ipv6 addr to tun iface<br><br>It's not needed because a link-local address will be added as a result<br>of Create Pdp Context Response. Morevoer, it fools sgsnemu ip addr<br>verifications since it gets used on some scenarios by applications.<br><br>Change-Id: I1d51f3ca91edbb3b788939982ab63264182ec2ce<br>---<br>M sgsnemu/sgsnemu.c<br>1 file changed, 47 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/sgsnemu/sgsnemu.c b/sgsnemu/sgsnemu.c</span><br><span>index 22be2fe..9d82145 100644</span><br><span>--- a/sgsnemu/sgsnemu.c</span><br><span>+++ b/sgsnemu/sgsnemu.c</span><br><span>@@ -46,6 +46,10 @@</span><br><span> #include <resolv.h></span><br><span> #include <time.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#if defined(__linux__)</span><br><span style="color: hsl(120, 100%, 40%);">+#include <linux/if_link.h></span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #include "config.h"</span><br><span> #include "../lib/tun.h"</span><br><span> #include "../lib/ippool.h"</span><br><span>@@ -999,6 +1003,37 @@</span><br><span> return proc_read(path);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* write a single value to a /proc file */</span><br><span style="color: hsl(120, 100%, 40%);">+static int proc_write(const char *path, const char *value)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int ret;</span><br><span style="color: hsl(120, 100%, 40%);">+ FILE *f;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ f = fopen(path, "w");</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!f) {</span><br><span style="color: hsl(120, 100%, 40%);">+ SYS_ERR(DSGSN, LOGL_ERROR, 0, "fopen(%s) failed!\n", path);</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((ret = fputs(value, f)) < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ SYS_ERR(DSGSN, LOGL_ERROR, 0, "proc_write(%s, %s) failed!\n", path, value);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ ret = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ fclose(f);</span><br><span style="color: hsl(120, 100%, 40%);">+ return ret;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Write value of to /proc/sys/net/ipv6/conf file for given device.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Memory is dynamically allocated, caller must free it later. */</span><br><span style="color: hsl(120, 100%, 40%);">+static int proc_ipv6_conf_write(const char *dev, const char *file, const char *value)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *fmt = "/proc/sys/net/ipv6/conf/%s/%s";</span><br><span style="color: hsl(120, 100%, 40%);">+ char path[strlen(fmt) + strlen(dev) + strlen(file)+1];</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(path, sizeof(path), fmt, dev, file);</span><br><span style="color: hsl(120, 100%, 40%);">+ return proc_write(path, value);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static char *print_ipprot(int t)</span><br><span> {</span><br><span> struct protoent *pe = getprotobynumber(t);</span><br><span>@@ -1604,6 +1639,7 @@</span><br><span> struct timeval tv;</span><br><span> int diff;</span><br><span> #if defined(__linux__)</span><br><span style="color: hsl(120, 100%, 40%);">+ char buf[10];</span><br><span> sigset_t oldmask;</span><br><span> #endif</span><br><span> </span><br><span>@@ -1668,6 +1704,17 @@</span><br><span> "Failed to create tun");</span><br><span> exit(1);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#if defined(__linux__)</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Avoid tunnel setting its own link-local addr automatically, we don't need it. */</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(buf, sizeof(buf), "%u", IN6_ADDR_GEN_MODE_NONE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (proc_ipv6_conf_write(options.tun_dev_name, "addr_gen_mode", buf) < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ SYS_ERR(DSGSN, LOGL_ERROR, errno,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Failed to disable addr_gen_mode on %s\n", options.tun_dev_name);</span><br><span style="color: hsl(120, 100%, 40%);">+ exit(1);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> tun_set_cb_ind(tun, cb_tun_ind);</span><br><span> if (tun->fd > maxfd)</span><br><span> maxfd = tun->fd;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ggsn/+/17812">change 17812</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/+/17812"/><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: I1d51f3ca91edbb3b788939982ab63264182ec2ce </div>
<div style="display:none"> Gerrit-Change-Number: 17812 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>