Change in osmo-ggsn[master]: sgsnemu: Get rid of duplicated options.net

[pespin]

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/17821 )


Change subject: sgsnemu: Get rid of duplicated options.net
......................................................................

sgsnemu: Get rid of duplicated options.net

It's not really set by any cmdline arg, and it always contains same
content as options.netaddr.

Change-Id: Id3cdca0975bdd2893b4b83944c5ebf29b2994622
---
M sgsnemu/sgsnemu.c
1 file changed, 4 insertions(+), 7 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/21/17821/1

diff --git a/sgsnemu/sgsnemu.c b/sgsnemu/sgsnemu.c
index 94c7e13..45f07f5 100644
--- a/sgsnemu/sgsnemu.c
+++ b/sgsnemu/sgsnemu.c
@@ -96,7 +96,7 @@
 	int createif;		/* Create local network interface */
 	char *tun_dev_name;
 	char *netns;
-	struct in46_addr netaddr, net;	/* Network interface  */
+	struct in46_addr netaddr;	/* Network interface  */
 	size_t prefixlen;
 	char *ipup, *ipdown;	/* Filename of scripts */
 	int defaultroute;	/* Set up default route */
@@ -889,16 +889,13 @@
 	/* Store net as in_addr net and mask                            */
 	if (args_info.net_arg) {
 		if (ippool_aton
-		    (&options.net, &options.prefixlen, args_info.net_arg, 0)) {
+		    (&options.netaddr, &options.prefixlen, args_info.net_arg, 0)) {
 			SYS_ERR(DSGSN, LOGL_ERROR, 0,
 				"Invalid network address: %s!",
 				args_info.net_arg);
 			exit(1);
 		}
-		options.netaddr = options.net;
-
 	} else {
-		memset(&options.net, 0, sizeof(options.net));
 		options.prefixlen = 0;
 		memset(&options.netaddr, 0, sizeof(options.netaddr));
 	}
@@ -1512,7 +1509,7 @@
 			break;
 		}
 
-		if ((options.createif) && (!options.net.len)) {
+		if ((options.createif) && (!options.netaddr.len)) {
 			size_t prefixlen = 32;
 			if (addr[i].len == 16)
 				prefixlen = 64;
@@ -1718,7 +1715,7 @@
 			maxfd = tun->fd;
 	}
 
-	if ((options.createif) && (options.net.len)) {
+	if ((options.createif) && (options.netaddr.len)) {
 		tun_addaddr(tun, &options.netaddr, NULL, options.prefixlen);
 		if (options.defaultroute) {
 			struct in_addr rm;

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/17821
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-Change-Id: Id3cdca0975bdd2893b4b83944c5ebf29b2994622
Gerrit-Change-Number: 17821
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200415/fc090409/attachment.htm>