cellular-infrastructure
/
osmo-ggsn
mirror of https://gerrit.osmocom.org/osmo-ggsn
9
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
Pau Espin 2020-04-15 14:29:25 +02:00
parent ee1529e5ac
commit 964f08a919
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sgsnemu/sgsnemu.c
View File

@ -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);