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 /openvpn.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 'openvpn.h')
| -rw-r--r-- | openvpn.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -205,8 +205,8 @@ struct context_2 struct link_socket_info *link_socket_info; const struct link_socket *accept_from; /* possibly do accept() on a parent link_socket */ - struct sockaddr_in to_link_addr; /* IP address of remote */ - struct sockaddr_in from; /* address of incoming datagram */ + struct link_socket_actual *to_link_addr; /* IP address of remote */ + struct link_socket_actual from; /* address of incoming datagram */ /* MTU frame parameters */ struct frame frame; |