[Openvpn-devel] [PATCH] Simplify print_sockaddr_ex function, merge duplicate ipv4/ipv6 logic

2012-09-03 Thread Arne Schwabe
Some BSD need the right salen, max(sizeof(v4),sizeof(v6)) does not work. Since sa_len is not a member in sockaddr for Linux and Windows and SA_LEN is no available on Darwin, NetBSD explicitly set salem Signed-off-by: Arne Schwabe --- src/openvpn/socket.c | 89 ++--

[Openvpn-devel] [PATCH] Simplify print_sockaddr_ex function, merge duplicate ipv4/ipv6 logic

2012-09-03 Thread Arne Schwabe
Some BSD need the right salen, max(sizeof(v4),sizeof(v6)) does not work. Since sa_len is not a member in sockaddr for Linux and Windows and SA_LEN is no available on Darwin, NetBSD explicitly set salem Signed-off-by: Arne Schwabe --- src/openvpn/socket.c | 89 ++--

Re: [Openvpn-devel] [PATCH] Simplify print_sockaddr_ex function, merge duplicate ipv4/ipv6 logic

2012-09-03 Thread Gert Doering
Hi, On Mon, Sep 03, 2012 at 08:49:42AM +0200, Arne Schwabe wrote: > Some BSD need the right salen, max(sizeof(v4),sizeof(v6)) does not work. > Since sa_len is not a member in sockaddr for Linux and Windows and SA_LEN is > no available on Darwin, NetBSD explicitly set salem "Something sneaked in

Re: [Openvpn-devel] [PATCH] Simplify print_sockaddr_ex function, merge duplicate ipv4/ipv6 logic

2012-09-03 Thread Arne Schwabe
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Am 03.09.12 09:09, schrieb Gert Doering: > Hi, > > On Mon, Sep 03, 2012 at 08:49:42AM +0200, Arne Schwabe wrote: >> Some BSD need the right salen, max(sizeof(v4),sizeof(v6)) does not work. Since sa_len is not a member in sockaddr for Linux and Windows

[Openvpn-devel] [PATCH] Simplify print_sockaddr_ex function, merge duplicate ipv4/ipv6 logic

2012-09-03 Thread Arne Schwabe
--- src/openvpn/socket.c | 68 ++ 1 file changed, 30 insertions(+), 38 deletions(-) diff --git a/src/openvpn/socket.c b/src/openvpn/socket.c index 505cf3b..a9adf3f 100644 --- a/src/openvpn/socket.c +++ b/src/openvpn/socket.c @@ -2164,60 +2164,52 @

Re: [Openvpn-devel] [PATCH] Simplify print_sockaddr_ex function, merge duplicate ipv4/ipv6 logic

2012-09-03 Thread Gert Doering
Hi, this looks like it should work both on *BSD and on Linux - explicit salen parameter, based on sa_family, no special macros (since we have the switch/case part anyway). And the tabs are right \o/ ACK ;-) gert On Mon, Sep 03, 2012 at 09:26:16AM +0200, Arne Schwabe wrote: > --- > src/openvp

Re: [Openvpn-devel] [Version 4] Merge getaddr_multi and getaddr6 into one function

2012-09-03 Thread Samuli Seppänen
> I ACK this, but please remember to tell your editor to use 8-character tabs, > as that is "what the rest of the code uses" - some of the new code looks > quite weird with ":set ts=8", and there's more diffs in there due to > whitespace changes (4 spaces getting converted into a single tab, like

[Openvpn-devel] [PATCH 2/2] Document that keep alive will double the second value in server mode and give a short explanation why the value is chosen.

2012-09-03 Thread Arne Schwabe
--- doc/openvpn.8 |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/openvpn.8 b/doc/openvpn.8 index f586744..bfc8c25 100644 --- a/doc/openvpn.8 +++ b/doc/openvpn.8 @@ -1582,7 +1582,11 @@ A helper directive designed to simplify the expression of .B \-\-ping and .B \

[Openvpn-devel] [PATCH v2] Document that keep alive will double the second value in server mode and give a short explanation why the value is chosen.

2012-09-03 Thread Arne Schwabe
--- doc/openvpn.8 |4 1 file changed, 4 insertions(+) diff --git a/doc/openvpn.8 b/doc/openvpn.8 index f586744..6b10fe4 100644 --- a/doc/openvpn.8 +++ b/doc/openvpn.8 @@ -1584,6 +1584,10 @@ and .B \-\-ping-restart in server mode configurations. +The server timeout is set twice the val

Re: [Openvpn-devel] [PATCH v2] Document that keep alive will double the second value in server mode and give a short explanation why the value is chosen.

2012-09-03 Thread Gert Doering
Hi, ACK :) gert On Mon, Sep 03, 2012 at 02:16:04PM +0200, Arne Schwabe wrote: > --- > doc/openvpn.8 |4 > 1 file changed, 4 insertions(+) > > diff --git a/doc/openvpn.8 b/doc/openvpn.8 > index f586744..6b10fe4 100644 > --- a/doc/openvpn.8 > +++ b/doc/openvpn.8 > @@ -1584,6 +1584,10 @@