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

[pespin]

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


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

sgsnemu: Get rid of duplicated options.destaddr

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

Change-Id: I5a4e3c4b5ae43a89a7d0af62fb396311dcb6ebae
---
M sgsnemu/sgsnemu.c
1 file changed, 3 insertions(+), 6 deletions(-)



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

diff --git a/sgsnemu/sgsnemu.c b/sgsnemu/sgsnemu.c
index 66ca228..94c7e13 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, destaddr, net;	/* Network interface  */
+	struct in46_addr netaddr, net;	/* Network interface  */
 	size_t prefixlen;
 	char *ipup, *ipdown;	/* Filename of scripts */
 	int defaultroute;	/* Set up default route */
@@ -896,13 +896,11 @@
 			exit(1);
 		}
 		options.netaddr = options.net;
-		options.destaddr = options.net;
 
 	} else {
 		memset(&options.net, 0, sizeof(options.net));
 		options.prefixlen = 0;
 		memset(&options.netaddr, 0, sizeof(options.netaddr));
-		memset(&options.destaddr, 0, sizeof(options.destaddr));
 	}
 
 	/* ipup */
@@ -1721,12 +1719,11 @@
 	}
 
 	if ((options.createif) && (options.net.len)) {
-		/* printf("Setting up interface and routing\n"); */
-		tun_addaddr(tun, &options.netaddr, &options.destaddr, options.prefixlen);
+		tun_addaddr(tun, &options.netaddr, NULL, options.prefixlen);
 		if (options.defaultroute) {
 			struct in_addr rm;
 			rm.s_addr = 0;
-			netdev_addroute(&rm, &options.destaddr.v4, &rm);
+			netdev_addroute(&rm, &options.netaddr.v4, &rm);
 		}
 		if (options.ipup)
 			tun_runscript(tun, options.ipup);

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

Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-Change-Id: I5a4e3c4b5ae43a89a7d0af62fb396311dcb6ebae
Gerrit-Change-Number: 17820
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/b3c35f22/attachment.htm>