<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ggsn/+/17820">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: Get rid of duplicated options.destaddr<br><br>It's not really set by any cmdline arg, and it always contains same<br>content as options.netaddr.<br><br>Change-Id: I5a4e3c4b5ae43a89a7d0af62fb396311dcb6ebae<br>---<br>M sgsnemu/sgsnemu.c<br>1 file changed, 3 insertions(+), 6 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 66ca228..94c7e13 100644</span><br><span>--- a/sgsnemu/sgsnemu.c</span><br><span>+++ b/sgsnemu/sgsnemu.c</span><br><span>@@ -96,7 +96,7 @@</span><br><span>     int createif;           /* Create local network interface */</span><br><span>         char *tun_dev_name;</span><br><span>  char *netns;</span><br><span style="color: hsl(0, 100%, 40%);">-    struct in46_addr netaddr, destaddr, net;        /* Network interface  */</span><br><span style="color: hsl(120, 100%, 40%);">+      struct in46_addr netaddr, net;  /* Network interface  */</span><br><span>     size_t prefixlen;</span><br><span>    char *ipup, *ipdown;    /* Filename of scripts */</span><br><span>    int defaultroute;       /* Set up default route */</span><br><span>@@ -896,13 +896,11 @@</span><br><span>                   exit(1);</span><br><span>             }</span><br><span>            options.netaddr = options.net;</span><br><span style="color: hsl(0, 100%, 40%);">-          options.destaddr = options.net;</span><br><span> </span><br><span>  } else {</span><br><span>             memset(&options.net, 0, sizeof(options.net));</span><br><span>            options.prefixlen = 0;</span><br><span>               memset(&options.netaddr, 0, sizeof(options.netaddr));</span><br><span style="color: hsl(0, 100%, 40%);">-               memset(&options.destaddr, 0, sizeof(options.destaddr));</span><br><span>  }</span><br><span> </span><br><span>        /* ipup */</span><br><span>@@ -1721,12 +1719,11 @@</span><br><span>         }</span><br><span> </span><br><span>        if ((options.createif) && (options.net.len)) {</span><br><span style="color: hsl(0, 100%, 40%);">-          /* printf("Setting up interface and routing\n"); */</span><br><span style="color: hsl(0, 100%, 40%);">-           tun_addaddr(tun, &options.netaddr, &options.destaddr, options.prefixlen);</span><br><span style="color: hsl(120, 100%, 40%);">+             tun_addaddr(tun, &options.netaddr, NULL, options.prefixlen);</span><br><span>             if (options.defaultroute) {</span><br><span>                  struct in_addr rm;</span><br><span>                   rm.s_addr = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-                  netdev_addroute(&rm, &options.destaddr.v4, &rm);</span><br><span style="color: hsl(120, 100%, 40%);">+                  netdev_addroute(&rm, &options.netaddr.v4, &rm);</span><br><span>          }</span><br><span>            if (options.ipup)</span><br><span>                    tun_runscript(tun, options.ipup);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ggsn/+/17820">change 17820</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/+/17820"/><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: I5a4e3c4b5ae43a89a7d0af62fb396311dcb6ebae </div>
<div style="display:none"> Gerrit-Change-Number: 17820 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </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>