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
* code re-ordered
@@ -643,14 +553,14 @@
g_profile=Yes
option=${option#p}
;;
- d*)
- g_debug=Yes;
- option=${option#d}
- ;;
r*)
g_preview=Yes;
option=${option#r}
;;
+ d*)
+ g_debug=Yes;
+ option=${option#d}
+ ;;
*)
* some changed whitespace
* slightly different calling conventions
- if compiler $g_debugging $nolock compile ${VARDIR}/.start; then
+ if compiler run $g_debugging $nolock compile
${VARDIR}/.start; then
* Possible bug?
- [ -z "$LOGFORMAT" ] && LOGFORMAT='Shorewall:%s.%s'
+ [ -n "$LOGFORMAT" ] || LOGFORMAT='Shorewall6:%s.%s'
It seems like we can largely merge both files though - the differences
seem mostly down to support for ipset/tc/ipcalc/iprange?
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?
Thanks
Ed W
------------------------------------------------------------------------------
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
