From: David Sommerseth Date: Wed, 28 Jul 2010 09:22:51 +0000 (+0200) Subject: Merge branch 'svn-BETA21' into beta2.2 X-Git-Tag: v2.2-beta1~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=328500c490c36c679e275dbf99c2820f58bcbaa3;p=thirdparty%2Fopenvpn.git Merge branch 'svn-BETA21' into beta2.2 Conflicts: openvpn.8 - Enhancements to the --register-dns description ssl.h - Community changed n_packets and n_bytes to use counter_type instead of int to avoid integer overflows (commit 6484c6299cf298107316e6497) Signed-off-by: David Sommerseth --- 328500c490c36c679e275dbf99c2820f58bcbaa3 diff --cc openvpn.8 index 3ad232a3d,53aabdc1f..54fe720b6 --- a/openvpn.8 +++ b/openvpn.8 @@@ -4762,9 -4749,10 +4762,10 @@@ This option has the same caveats a above. .\"********************************************************* .TP -.B --register-dns +.B \-\-register-dns - Run ipconfig /flushdns and ipconfig /registerdns on - connection initiation. This is known to kick Windows into + Run net stop dnscache, net start dnscache, ipconfig /flushdns + and ipconfig /registerdns on connection initiation. + This is known to kick Windows into recognizing pushed DNS servers. .\"********************************************************* .TP diff --cc ssl.h index 02234c393,c6a5627f0..8415d5555 --- a/ssl.h +++ b/ssl.h @@@ -379,8 -376,10 +379,10 @@@ struct key_stat struct reliable *rec_reliable; /* order incoming ciphertext packets before we pass to TLS */ struct reliable_ack *rec_ack; /* buffers all packet IDs we want to ACK back to sender */ + struct buffer_list *paybuf; + - int n_bytes; /* how many bytes sent/recvd since last key exchange */ - int n_packets; /* how many packets sent/recvd since last key exchange */ + counter_type n_bytes; /* how many bytes sent/recvd since last key exchange */ + counter_type n_packets; /* how many packets sent/recvd since last key exchange */ /* * If bad username/password, TLS connection will come up but 'authenticated' will be false.