diff options
author | David Sommerseth <dazo@users.sourceforge.net> | 2011-04-25 17:08:14 +0200 |
---|---|---|
committer | David Sommerseth <dazo@users.sourceforge.net> | 2011-04-25 17:08:14 +0200 |
commit | dcf4bcc2d95faac5d7c4844ca841359526601c69 (patch) | |
tree | bb696ead3dadb09234337c2c4e7461a3f7a7ce88 /manage.c | |
parent | 285252d1a189c331becde940d948d7ca1fe778fd (diff) | |
parent | 6dbf82a96253add5ed5f6c923080f4de4366c874 (diff) | |
download | openvpn-dcf4bcc2d95faac5d7c4844ca841359526601c69.tar.gz openvpn-dcf4bcc2d95faac5d7c4844ca841359526601c69.tar.xz openvpn-dcf4bcc2d95faac5d7c4844ca841359526601c69.zip |
Merge branch 'feat_ipv6_transport'
Diffstat (limited to 'manage.c')
-rw-r--r-- | manage.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -1999,9 +1999,9 @@ man_settings_init (struct man_settings *ms, /* * Initialize socket address */ - ms->local.sa.sin_family = AF_INET; - ms->local.sa.sin_addr.s_addr = 0; - ms->local.sa.sin_port = htons (port); + ms->local.addr.in4.sin_family = AF_INET; + ms->local.addr.in4.sin_addr.s_addr = 0; + ms->local.addr.in4.sin_port = htons (port); /* * Run management over tunnel, or @@ -2013,7 +2013,7 @@ man_settings_init (struct man_settings *ms, } else { - ms->local.sa.sin_addr.s_addr = getaddr + ms->local.addr.in4.sin_addr.s_addr = getaddr (GETADDR_RESOLVE|GETADDR_WARN_ON_SIGNAL|GETADDR_FATAL, addr, 0, NULL, NULL); } } @@ -2472,7 +2472,7 @@ management_post_tunnel_open (struct management *man, const in_addr_t tun_local_i && man->connection.state == MS_INITIAL) { /* listen on our local TUN/TAP IP address */ - man->settings.local.sa.sin_addr.s_addr = htonl (tun_local_ip); + man->settings.local.addr.in4.sin_addr.s_addr = htonl (tun_local_ip); man_connection_init (man); } |