Re: [Openvpn-devel] FreeBSD funny in the code

2010-03-01 Thread Bernhard Schmidt
On 01.03.2010 22:59, David Sommerseth wrote: Could you please have a look at git://git.birkenwald.de/openvpn.git test-rebase branch? The history of gert-ipv6 was starting to look a bit weird (duplicate commits with the same content), to I rebased it on your bugfix2.1 branch (and dropped the dupl

Re: [Openvpn-devel] FreeBSD funny in the code

2010-03-01 Thread David Sommerseth
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 01/03/10 22:41, Bernhard Schmidt wrote: > Hi David, > >>> It doesn't make a difference at the moment (since the patch came from >>> feat_ipv6_payload in the first place), but what's the general wish for >>> the future? What to rebase on? >> >> To b

Re: [Openvpn-devel] FreeBSD funny in the code

2010-03-01 Thread Bernhard Schmidt
Hi David, It doesn't make a difference at the moment (since the patch came from feat_ipv6_payload in the first place), but what's the general wish for the future? What to rebase on? To be very honest, I'm very uncertain about what's best. Because it will a lot of changes in multiple branches.

Re: [Openvpn-devel] FreeBSD funny in the code

2010-03-01 Thread David Sommerseth
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 01/03/10 22:09, Bernhard Schmidt wrote: > David Sommerseth wrote: > > Hi David, > >>> David, could you please pull my branch from Berni, and move that patch >>> to wherever bugfixes/code cleanups go? It should merge easily into >>> all branches

Re: [Openvpn-devel] FreeBSD funny in the code

2010-03-01 Thread Bernhard Schmidt
David Sommerseth wrote: Hi David, >> David, could you please pull my branch from Berni, and move that patch >> to wherever bugfixes/code cleanups go? It should merge easily into >> all branches. > > Pushed and pulled. I've only put your extra commit into the bugfix2.1 > branch (as a cherry-pi

Re: [Openvpn-devel] FreeBSD funny in the code

2010-02-28 Thread David Sommerseth
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 28/02/10 23:14, Gert Doering wrote: > Hi, > > On Sun, Feb 28, 2010 at 04:37:45PM +0100, David Sommerseth wrote: >> On 28/02/10 16:10, Eric F Crist wrote: >>> ACK, >>> >>> It's not you, that's duplicate code. >> >> ACK. I this is indeed duplicated.

Re: [Openvpn-devel] FreeBSD funny in the code

2010-02-28 Thread Gert Doering
Hi, On Sun, Feb 28, 2010 at 04:37:45PM +0100, David Sommerseth wrote: > On 28/02/10 16:10, Eric F Crist wrote: > > ACK, > > > > It's not you, that's duplicate code. > > ACK. I this is indeed duplicated. Thanks. I have committed this to my branch (because I'm too tired right now to get branch

Re: [Openvpn-devel] FreeBSD funny in the code

2010-02-28 Thread David Sommerseth
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 28/02/10 16:10, Eric F Crist wrote: > ACK, > > It's not you, that's duplicate code. > ACK. I this is indeed duplicated. David S. > On Feb 28, 2010, at 09:05:46, Gert Doering wrote: > >> Hi, >> >> tun.c contains this code, in the >> >> #elif

Re: [Openvpn-devel] FreeBSD funny in the code

2010-02-28 Thread Eric F Crist
ACK, It's not you, that's duplicate code. Eric On Feb 28, 2010, at 09:05:46, Gert Doering wrote: > Hi, > > tun.c contains this code, in the > > #elif defined(TARGET_FREEBSD)||defined(TARGET_DRAGONFLY) > > part of do_ifconfig() (about line 983 in the IPv6 payload branch): > > -

[Openvpn-devel] FreeBSD funny in the code

2010-02-28 Thread Gert Doering
Hi, tun.c contains this code, in the #elif defined(TARGET_FREEBSD)||defined(TARGET_DRAGONFLY) part of do_ifconfig() (about line 983 in the IPv6 payload branch): - snip else { if (tt->topology == TOP_SUBNET) argv_printf (&argv,