From e53a0fd835fc38068a55d2162253f1bf2d9c3369 Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Tue, 9 Sep 2008 04:21:02 +0000 Subject: [PATCH] fixed cli option in fwbedit usage and man page --- build_num | 2 +- doc/ChangeLog | 6 + doc/fwbedit.1 | 34 +- qmake.inc | 34 +- src/fwbedit/fwbedit.cpp | 34 +- test/ipt/large_policy_test.fwb | 663 +++++++++++++++++++++++++++++---- 6 files changed, 658 insertions(+), 115 deletions(-) diff --git a/build_num b/build_num index 6e9c155f6..026a45ece 100644 --- a/build_num +++ b/build_num @@ -1 +1 @@ -#define BUILD_NUM 517 +#define BUILD_NUM 518 diff --git a/doc/ChangeLog b/doc/ChangeLog index 44c9f0d3c..223349c89 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,9 @@ +2008-09-08 Vadim Kurland + + * fwbedit.cpp (usage): fixed "usage" in fwbedit, command line + option that specifies object attributes for the command "new" is + "-a", not "-o". Also fixed this in the man page. + 2008-09-08 vadim * main_mac.cpp (odocHandler): bug #2099700 "Association of the diff --git a/doc/fwbedit.1 b/doc/fwbedit.1 index 0a71acc50..71d0fdc1e 100644 --- a/doc/fwbedit.1 +++ b/doc/fwbedit.1 @@ -111,7 +111,7 @@ objects have attributes "icmp_type" and "icmp_code". -.B add -f file.fwb -p group -o object +.B add -f file.fwb -g group -o object Adds object specified by path or ID to a group, also specified by its path or ID. @@ -119,21 +119,21 @@ path or ID. .PP -f file.fwb: data file .PP - -p group: group the object should be added to, + -g group: group the object should be added to, full path or ID .PP -o object: object to be deleted, full path or ID -.B remove -f file.fwb -p group -o object +.B remove -f file.fwb -g group -o object Removes object from a group. .PP -f file.fwb: data file .PP - -p group: group the object should be removed from, + -g group: group the object should be removed from, full path or ID .PP -o object: object to be deleted, full path or ID @@ -160,35 +160,35 @@ data file and repairs it if necessary. .PP .PP --t Firewall -o platform, host OS +-t Firewall -a platform, host OS .PP --t IPv4 -o IP address [,netmask] +-t IPv4 -a IP address [,netmask] .PP --t IPv6 -o IPv6 address [,masklen] +-t IPv6 -a IPv6 address [,masklen] .PP --t DNSName -o DNS record,run time +-t DNSName -a DNS record,run time .PP --t AddressRange -o start address, end address +-t AddressRange -a start address, end address .PP -t ObjectGroup .PP --t Network -o address,netmask +-t Network -a address,netmask .PP --t NetworkIPv6 -o ipv6_address,netmask_length +-t NetworkIPv6 -a ipv6_address,netmask_length .PP --t Interval -o start time,start date,start day,end time, end date, end day +-t Interval -a start time,start date,start day,end time, end date, end day .PP --t Interface -o security level,address type (dynamic or unnumbered),management +-t Interface -a security level,address type (dynamic or unnumbered),management .PP -t Host .PP --t TCPService -o source port range start,end,destination port range start,end,UAPRSF,UAPRSF +-t TCPService -a source port range start,end,destination port range start,end,UAPRSF,UAPRSF .PP --t UDPService -o source port range start,end,Destination port range start,end +-t UDPService -a source port range start,end,Destination port range start,end .PP --t ICMPService -o ICMP type,ICMP code +-t ICMPService -a ICMP type,ICMP code .PP --t IPService -o protocol number,lsrr/ssrr/rr/ts/fragm/short_fragm +-t IPService -a protocol number,lsrr/ssrr/rr/ts/fragm/short_fragm .SH EXAMPLES diff --git a/qmake.inc b/qmake.inc index ef06b86ba..2cf2938de 100644 --- a/qmake.inc +++ b/qmake.inc @@ -11,15 +11,15 @@ SO_VERSION = @LIBFWBUILDER_SOLIB_VERSION@ DEFINES += $$(DEFINES) LANGUAGE = C++ UI_DIR = ui -MANDIR = /Users/vadim/src/fwb3-branch-v3/install_root/share/man/ -DOCDIR = /Users/vadim/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.1 +MANDIR = /home/vadim/src/fwb3-branch-v3/install_root/share/man/ +DOCDIR = /home/vadim/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.1 HAVE_ANTLR_RUNTIME = 1 HAVE_EXTERNAL_ANTLR = 0 unix { - ANTLR_INCLUDEPATH = /Users/vadim/src/fwb3-branch-v3/source/fwbuilder/src/ - ANTLR_LIBS = /Users/vadim/src/fwb3-branch-v3/source/fwbuilder/src/antlr/libantlr.a + ANTLR_INCLUDEPATH = /home/vadim/src/fwb3-branch-v3/source/fwbuilder/src/ + ANTLR_LIBS = /home/vadim/src/fwb3-branch-v3/source/fwbuilder/src/antlr/libantlr.a FWBPARSER_LIB = ../parsers/libfwbparser.a } @@ -30,38 +30,38 @@ unix { MOC_DIR = .moc OBJECTS_DIR = .obj - PREFIX = /Users/vadim/src/fwb3-branch-v3/install_root + PREFIX = /home/vadim/src/fwb3-branch-v3/install_root exec_prefix = @EXEC_PREFIX@ DESTDIR = - ICONSDIR = + ICONSDIR = /home/vadim/src/fwb3-branch-v3/install_root/share//icons/hicolor/ - INCLUDEPATH += .. ../.. $$(INCLUDEPATH) /Users/vadim/src/fwb3-branch-v3/install_root/include/ /Users/vadim/src/fwb3-branch-v3/install_root/include/fwb-3 /usr/include/libxml2 + INCLUDEPATH += .. ../.. $$(INCLUDEPATH) /home/vadim/src/fwb3-branch-v3/install_root/include/ /home/vadim/src/fwb3-branch-v3/install_root/include/fwb-3 /usr/include/libxml2 - LIBS_FWCOMPILER = -L/Users/vadim/src/fwb3-branch-v3/install_root/lib -lfwcompiler -lfwbuilder -lxslt -lxml2 -lz -lpthread -licucore -lm -lnetsnmp - LIBS_FWBUILDER = -L/Users/vadim/src/fwb3-branch-v3/install_root/lib -lfwbuilder -lxslt -lxml2 -lz -lpthread -licucore -lm -lnetsnmp + LIBS_FWCOMPILER = -L/home/vadim/src/fwb3-branch-v3/install_root/lib -pthread -lfwcompiler -lfwbuilder -lxslt -lxml2 -lnetsnmp -lm -lwrap + LIBS_FWBUILDER = -L/home/vadim/src/fwb3-branch-v3/install_root/lib -pthread -lfwbuilder -lxslt -lxml2 -lnetsnmp -lm -lwrap target.path = $$PREFIX/bin dtd.path = @TEMPLATE_DIR@/ migration.path = @TEMPLATE_DIR@/migration - doc.path = /Users/vadim/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.1 - datadir.path = /Users/vadim/src/fwb3-branch-v3/install_root/share/ + doc.path = /home/vadim/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.1 + datadir.path = /home/vadim/src/fwb3-branch-v3/install_root/share/ # win32:target.path = $$PREFIX/ # unix:target.path = $$PREFIX/share/fwbuilder/ # macx:target.path = $$PREFIX/ - res.path = ../Resources - res_os.path = ../Resources/os/ - res_platform.path = ../Resources/platform/ - res_help.path = ../Resources/help/ - res_desktop.path = /Users/vadim/src/fwb3-branch-v3/install_root/share//applications/ + res.path = /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.1 + res_os.path = /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.1/os/ + res_platform.path = /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.1/platform/ + res_help.path = /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.1/help/ + res_desktop.path = /home/vadim/src/fwb3-branch-v3/install_root/share//applications/ INSTALLS += res INSTALLS += res_os INSTALLS += res_platform # INSTALLS += icns - LIBS += $$LIBS_FWBUILDER -L/sw/lib -lpoll + LIBS += $$LIBS_FWBUILDER -lutil PKGLOCALEDIR = $$res.path/locale diff --git a/src/fwbedit/fwbedit.cpp b/src/fwbedit/fwbedit.cpp index 9b02ada7c..2ffe21c29 100644 --- a/src/fwbedit/fwbedit.cpp +++ b/src/fwbedit/fwbedit.cpp @@ -198,19 +198,19 @@ void usage() cout << endl; cout << - " add -f file.fwb -p group -o object\n" + " add -f file.fwb -g group -o object\n" "\n" " -f file.fwb: data file\n" - " -p group: group the object should be added to, \n" + " -g group: group the object should be added to, \n" " full path or ID\n" " -o object: object to be deleted, full path or ID\n"; cout << endl; cout << - " remove -f file.fwb -p group -o object\n" + " remove -f file.fwb -g group -o object\n" "\n" " -f file.fwb: data file\n" - " -p group: group the object should be removed from,\n" + " -g group: group the object should be removed from,\n" " full path or ID\n" " -o object: object to be deleted, full path or ID\n"; cout << endl; @@ -231,34 +231,34 @@ void usage() cout << endl; cout << " " << " -t " < - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + - - - - - + + + + + @@ -39,12 +560,15 @@ + + + - + @@ -54,12 +578,15 @@ + + + - + @@ -69,12 +596,15 @@ + + + - + @@ -84,12 +614,15 @@ + + + - + @@ -99,12 +632,15 @@ + + + - + @@ -114,31 +650,32 @@ + + + - + + + - - - + + + - - - + + - - - + + - - - + + - - - + + @@ -152,19 +689,19 @@ - + - - + + + + @@ -178,9 +715,9 @@ - + + @@ -190,11 +727,11 @@ - + - - - - + + + +