On Fri, Feb 19, 2010 at 12:10 PM, David Sommerseth <openvpn.l...@topphemmelig.net> wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > Hi guys! > On 18/02/10 22:45, JuanJo Ciarlante wrote: >> On Wed, Feb 17, 2010 at 6:46 PM, JuanJo Ciarlante <jjo...@google.com> > wrote: >> >>> I still need to do some touches for allmerged, as >>> we conflict w/ Gert's IPv6 patch on a mroute.c chunk >>> IIRC. >> > > Even though I know you both have told me that there would be a merge > conflict in mroute.c, I decided to put it on the mailing list - > hopefully to get an open discussion about it! > > I've attached the merge conflict. It would be great if you could sort > this out soon. Then I'll get both of your trees into the allmerged > branch ASAP. Right now only Gert's code is in the allmerged branch. > > What I do see might be a challenge (without knowing the code in > details), is that JJO's code is using #ifdef, while Gert's code is not. > With a conflict in mroute_addr_print_ex(), which includes an #ifdef I > see a potential disaster here. > > Personally, I would like to evaluate Gert's patches to see if they could > be #ifdef'ed. Then both IPv6 branches can both use USE_PF_INET6 to > enable or disable the IPv6 support.
IMHO they should have different #ifdef'ing, coming from eg: ../configure --enable-ipv6-transport --enable-ipv6-payload , mainly to ease future debugging, and to motivate wider audience thinking of: * different OSes (ipv6-transport builds and (probably)runs in windowze) * distros like Gentoo, already carrying ipv6-transport, may want to add a build option for the payload patch. * size constraints (embeeded like eg. freetz.org) * USE_PF_INET6 clearly speaks "transport" in its very name :) > I have not studied these patches, > so I don't know how doable that is. And this is my personal opinion, I > don't mean to instruct anyone into a direction. I will let you guys > find the proper direction. > > > kind regards, > > David Sommerseth > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v1.4.10 (GNU/Linux) > Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/ > > iEYEARECAAYFAkt+caIACgkQDC186MBRfrr5ZACgqLxiXN70pCOGY0zyvQGSCpo6 > n2EAn1le6hzZe4aThLfAKvYwK7d3CPSG > =e7yX > -----END PGP SIGNATURE----- > -- --JuanJo ; echo j...@gomosglep.com | sed 's/[SPAM]//g'
