<p>dmitrii.kalashnik has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ggsn/+/17963">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sgsnemu: use real tun device name after the device is up.<br><br>The device name option could be empty, using it without checking<br>would crash sgsnemu. Using the real device is better anyway.<br><br>Change-Id: Ic3934281bfc2e433323e4ab72cf5be2cbd1c962a<br>---<br>M sgsnemu/sgsnemu.c<br>1 file changed, 4 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/63/17963/1</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 4c51157..f137f2c 100644</span><br><span>--- a/sgsnemu/sgsnemu.c</span><br><span>+++ b/sgsnemu/sgsnemu.c</span><br><span>@@ -1928,11 +1928,11 @@</span><br><span>                we don't need it. Don't exit on error since this sysctl is</span><br><span>                   only available starting with linux 4.11. */</span><br><span>               snprintf(buf, sizeof(buf), "%u", IN6_ADDR_GEN_MODE_NONE);</span><br><span style="color: hsl(0, 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%);">+              if (proc_ipv6_conf_write(tun->devname, "addr_gen_mode", buf) < 0) {</span><br><span>                  SYS_ERR(DSGSN, LOGL_ERROR, errno,</span><br><span>                            "Failed to disable addr_gen_mode on %s, an extra link-local "</span><br><span>                              "ip address will appear on the tun device.\n",</span><br><span style="color: hsl(0, 100%, 40%);">-                                options.tun_dev_name);</span><br><span style="color: hsl(120, 100%, 40%);">+                                tun->devname);</span><br><span>            }</span><br><span> #endif</span><br><span> </span><br><span>@@ -1940,9 +1940,9 @@</span><br><span>              if (tun->fd > maxfd)</span><br><span>                   maxfd = tun->fd;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-         if (proc_ipv6_conf_write(options.tun_dev_name, "accept_ra", "0") < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+                if (proc_ipv6_conf_write(tun->devname, "accept_ra", "0") < 0) {</span><br><span>                    SYS_ERR(DSGSN, LOGL_ERROR, 0,</span><br><span style="color: hsl(0, 100%, 40%);">-                           "Failed to disable IPv6 SLAAC on %s\n", options.tun_dev_name);</span><br><span style="color: hsl(120, 100%, 40%);">+                              "Failed to disable IPv6 SLAAC on %s\n", tun->devname);</span><br><span>                  exit(1);</span><br><span>             }</span><br><span>    }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ggsn/+/17963">change 17963</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/+/17963"/><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: Ic3934281bfc2e433323e4ab72cf5be2cbd1c962a </div>
<div style="display:none"> Gerrit-Change-Number: 17963 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: dmitrii.kalashnik <Kalash969@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>