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

sgsnemu: use real tun device name after the device is up. 

The device name option could be empty, using it without checking
would crash sgsnemu. Using the real device is better anyway.

Change-Id: Ic3934281bfc2e433323e4ab72cf5be2cbd1c962a
This commit is contained in:
Dmitri Kalashnik 2020-04-28 13:10:56 +04:00
parent 04715d284f
commit db98f309a9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sgsnemu/sgsnemu.c
View File

@ -1928,11 +1928,11 @@ int main(int argc, char **argv)
we don't need it. Don't exit on error since this sysctl is
only available starting with linux 4.11. */
snprintf(buf, sizeof(buf), "%u", IN6_ADDR_GEN_MODE_NONE);
if (proc_ipv6_conf_write(options.tun_dev_name, "addr_gen_mode", buf) < 0) {
if (proc_ipv6_conf_write(tun->devname, "addr_gen_mode", buf) < 0) {
SYS_ERR(DSGSN, LOGL_ERROR, errno,
"Failed to disable addr_gen_mode on %s, an extra link-local "
"ip address will appear on the tun device.\n",
options.tun_dev_name);
tun->devname);
}
#endif
@ -1940,9 +1940,9 @@ int main(int argc, char **argv)
if (tun->fd > maxfd)
maxfd = tun->fd;
if (proc_ipv6_conf_write(options.tun_dev_name, "accept_ra", "0") < 0) {
if (proc_ipv6_conf_write(tun->devname, "accept_ra", "0") < 0) {
SYS_ERR(DSGSN, LOGL_ERROR, 0,
"Failed to disable IPv6 SLAAC on %s\n", options.tun_dev_name);
"Failed to disable IPv6 SLAAC on %s\n", tun->devname);
exit(1);
}
}