On 5/23/11 8:02 AM, Ed W wrote: > On 22/05/2011 21:50, Tom Eastep wrote: >> Also notice that I corrected the name of the function. I only tested the >> Shorewall6 patch before posting it; obviously I should have tested >> Shorewall too. > > Just a heads up, but "diff -u /sbin/shorewall /sbin/shorewall6" is quite > instructive? > > There are large chunks of differences such as
... > > > * Possible bug? > > - [ -z "$LOGFORMAT" ] && LOGFORMAT='Shorewall:%s.%s' > + [ -n "$LOGFORMAT" ] || LOGFORMAT='Shorewall6:%s.%s' While the two are different, they are equivalent. > > > > It seems like we can largely merge both files though - the differences > seem mostly down to support for ipset/tc/ipcalc/iprange? We actually need ipset support to be added to Shorewall6 now that ipset supports IPv6. The thought of trying to add ipcalc and iprange for IPv6 has always made my head hurt. > > I'm hesitant to send a patch for the simple bits because it will be > fragile if you are editing - do you see a future in trying to factor out > the common code here? I think it would be a big benefit to factor out the common code in both shorewall/shorewall6 and shorewall-lite/shorewall6-lite. If you want to try to take that on, then I recommend that you clone the git tree so that you can be working with my latest changes. -Tom -- Tom Eastep \ When I die, I want to go like my Grandfather who Shoreline, \ died peacefully in his sleep. Not screaming like Washington, USA \ all of the passengers in his car http://shorewall.net \________________________________________________
signature.asc
Description: OpenPGP digital signature
------------------------------------------------------------------------------ What Every C/C++ and Fortran developer Should Know! Read this article and learn how Intel has extended the reach of its next-generation tools to help Windows* and Linux* C/C++ and Fortran developers boost performance applications - including clusters. http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________ Shorewall-users mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/shorewall-users
