diff options
author | JuanJo Ciarlante <jjo@google.com> | 2009-09-13 13:43:04 +0200 |
---|---|---|
committer | JuanJo Ciarlante <juanjosec@gmail.com> | 2011-03-25 13:30:28 +0100 |
commit | 8335caf929f21b317a0243a12285e1f04361db25 (patch) | |
tree | f5a13a5196bda5db8681614ad19f18f522e3dfaa /manage.c | |
parent | badba714db7dc62c7844069d86f615ad946b4a6e (diff) | |
download | openvpn-8335caf929f21b317a0243a12285e1f04361db25.tar.gz openvpn-8335caf929f21b317a0243a12285e1f04361db25.tar.xz openvpn-8335caf929f21b317a0243a12285e1f04361db25.zip |
* rebased openvpn-2.1_rc1b.jjo.20061206.d.patch
* passes {udp,tcp}x{v4,v6} loopback tests
* passes {udp,tcp}x{v6} remote tests
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); } |