diff options
| author | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2005-10-15 08:44:02 +0000 |
|---|---|---|
| committer | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2005-10-15 08:44:02 +0000 |
| commit | 8bc93d7ffbc127e0b095c7274a68eb0c175f93ae (patch) | |
| tree | be0d71b15492041caeb3deb1ac923123a44ea96e /ping-inline.h | |
| parent | e9c5e1708139d62865db1c468b2a9fc8339b2f26 (diff) | |
| download | openvpn-8bc93d7ffbc127e0b095c7274a68eb0c175f93ae.tar.gz openvpn-8bc93d7ffbc127e0b095c7274a68eb0c175f93ae.tar.xz openvpn-8bc93d7ffbc127e0b095c7274a68eb0c175f93ae.zip | |
svn merge -r 618:619 $SO/patches/openvpn-2-0_rc16-mh/openvpn
Merged --multihome patch + aggregated sockflags.
Pre-2.1_beta3
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@622 e7ae566f-a301-0410-adde-c780ea21d3b5
Diffstat (limited to 'ping-inline.h')
| -rw-r--r-- | ping-inline.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ping-inline.h b/ping-inline.h index bf7fd81..14463de 100644 --- a/ping-inline.h +++ b/ping-inline.h @@ -37,7 +37,7 @@ check_ping_restart (struct context *c) && event_timeout_trigger (&c->c2.ping_rec_interval, &c->c2.timeval, (!c->options.ping_timer_remote - || addr_defined (&c->c1.link_socket_addr.actual)) + || link_socket_actual_defined (&c->c1.link_socket_addr.actual)) ? ETT_DEFAULT : 15)) check_ping_restart_dowork (c); } |