<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ggsn/+/17821">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sgsnemu: Get rid of duplicated options.net<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: Id3cdca0975bdd2893b4b83944c5ebf29b2994622<br>---<br>M sgsnemu/sgsnemu.c<br>1 file changed, 4 insertions(+), 7 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/21/17821/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 94c7e13..45f07f5 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, net; /* Network interface */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct in46_addr netaddr; /* 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>@@ -889,16 +889,13 @@</span><br><span> /* Store net as in_addr net and mask */</span><br><span> if (args_info.net_arg) {</span><br><span> if (ippool_aton</span><br><span style="color: hsl(0, 100%, 40%);">- (&options.net, &options.prefixlen, args_info.net_arg, 0)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ (&options.netaddr, &options.prefixlen, args_info.net_arg, 0)) {</span><br><span> SYS_ERR(DSGSN, LOGL_ERROR, 0,</span><br><span> "Invalid network address: %s!",</span><br><span> args_info.net_arg);</span><br><span> exit(1);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- options.netaddr = options.net;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- 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> }</span><br><span>@@ -1512,7 +1509,7 @@</span><br><span> break;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if ((options.createif) && (!options.net.len)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((options.createif) && (!options.netaddr.len)) {</span><br><span> size_t prefixlen = 32;</span><br><span> if (addr[i].len == 16)</span><br><span> prefixlen = 64;</span><br><span>@@ -1718,7 +1715,7 @@</span><br><span> maxfd = tun->fd;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if ((options.createif) && (options.net.len)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((options.createif) && (options.netaddr.len)) {</span><br><span> tun_addaddr(tun, &options.netaddr, NULL, options.prefixlen);</span><br><span> if (options.defaultroute) {</span><br><span> struct in_addr rm;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ggsn/+/17821">change 17821</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/+/17821"/><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: Id3cdca0975bdd2893b4b83944c5ebf29b2994622 </div>
<div style="display:none"> Gerrit-Change-Number: 17821 </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-MessageType: newchange </div>