diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2020-04-15 14:39:10 +0200 |
|---|---|---|
| committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2020-04-15 16:40:10 +0200 |
| commit | a1b3deefda07d8339632a2d72e50181d4aae2a45 (patch) | |
| tree | 3baf12f6886175f2a4bad5c178e12d827e21bbf4 | |
| parent | 964f08a91950921aca9de603a7a583c86943bb0e (diff) | |
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
| -rw-r--r-- | sgsnemu/sgsnemu.c | 11 |
1 files changed, 4 insertions, 7 deletions
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 @@ struct { 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 @@ static int process_options(int argc, char **argv) /* 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 @@ static int create_pdp_conf(struct pdp_t *pdp, void *cbp, int cause) 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 @@ int main(int argc, char **argv) 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; |