diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2020-04-15 14:29:25 +0200 |
|---|---|---|
| committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2020-04-15 16:40:10 +0200 |
| commit | 964f08a91950921aca9de603a7a583c86943bb0e (patch) | |
| tree | b0b55475e429002118478362631b71b8cba4712d | |
| parent | ee1529e5ac8eaa4856f97458f683bd84a7446433 (diff) | |
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
| -rw-r--r-- | sgsnemu/sgsnemu.c | 9 |
1 files changed, 3 insertions, 6 deletions
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 @@ struct { 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 @@ static int process_options(int argc, char **argv) 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 @@ int main(int argc, char **argv) } 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); |