onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-09-21 07:04:52 +02:00
Code Issues Releases Wiki Activity

changed token name from "ESP" to "ESP_WORD" to avoid conflict with

Browse Source 
macro "ESP" that happened during build on OpenSolaris

fixed unit test (ObjectMatcher matches ipv6 only when internal flag is
set accordingly)

set version to 5.0.1
This commit is contained in:
Vadim Kurland
2011-08-01 17:56:22 -07:00
parent 9a2a1d6e83
commit 25ab6bb227
20 changed files with 226 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+2 -2
View File
@@ -2,12 +2,12 @@
FWB_MAJOR_VERSION=5 FWB_MAJOR_VERSION=5
FWB_MINOR_VERSION=0 FWB_MINOR_VERSION=0
FWB_MICRO_VERSION=0 FWB_MICRO_VERSION=1
# build number is like "nano" version number. I am incrementing build # build number is like "nano" version number. I am incrementing build
# number during development cycle # number during development cycle
# #
BUILD_NUM="3568" BUILD_NUM="3569"
VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM" VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM"
VERSION.h
+1 -1
View File
@@ -1,2 +1,2 @@
#define VERSION "5.0.0.3568" #define VERSION "5.0.1.3569"
#define GENERATION "5.0" #define GENERATION "5.0"
doc/ChangeLog
+6
View File
@@ -1,9 +1,15 @@
2011-08-01 Vadim Kurland <vadim@netcitadel.com> 2011-08-01 Vadim Kurland <vadim@netcitadel.com>
* pix.g (static_command_common_last_parameters): changed token
name from "ESP" to "ESP_WORD" to avoid conflict with macro "ESP"
that happened during build on OpenSolaris
* unit_tests/ObjectMatcherTest/ObjectMatcherTest.cpp (matchTest): * unit_tests/ObjectMatcherTest/ObjectMatcherTest.cpp (matchTest):
fixed unit test (ObjectMatcher matches ipv6 only when internal fixed unit test (ObjectMatcher matches ipv6 only when internal
flag is set accordingly) flag is set accordingly)
* VERSION: set version to 5.0.1
2011-07-28 vadim <vadim@netcitadel.com> 2011-07-28 vadim <vadim@netcitadel.com>
* version 5.0.0. release * version 5.0.0. release
packaging/fwbuilder-static-qt.spec
+1 -1
View File
@@ -3,7 +3,7 @@
%define name fwbuilder %define name fwbuilder
%define version 5.0.0.3568 %define version 5.0.1.3569
%define release 1 %define release 1
%if "%_vendor" == "MandrakeSoft" %if "%_vendor" == "MandrakeSoft"
packaging/fwbuilder.control
+2 -2
View File
@@ -4,6 +4,6 @@ Replaces: fwbuilder (<=4.1.1-1), fwbuilder-common, fwbuilder-bsd, fwbuilder-linu
Priority: extra Priority: extra
Section: checkinstall Section: checkinstall
Maintainer: vadim@fwbuilder.org Maintainer: vadim@fwbuilder.org
Version: 5.0.0.3568-1 Version: 5.0.1.3569-1
Depends: libqt4-gui (>= 4.3.0), libxml2, libxslt1.1, libsnmp | libsnmp15 Depends: libqt4-gui (>= 4.4.0), libqt4-network (>= 4.4.0), libxml2, libxslt1.1, libsnmp | libsnmp15
Description: Firewall Builder GUI and policy compilers Description: Firewall Builder GUI and policy compilers
packaging/fwbuilder.spec
+1 -1
View File
@@ -1,6 +1,6 @@
%define name fwbuilder %define name fwbuilder
%define version 5.0.0.3568 %define version 5.0.1.3569
%define release 1 %define release 1
%if "%_vendor" == "MandrakeSoft" %if "%_vendor" == "MandrakeSoft"
src/parsers/PFCfgLexer.cpp
+1 -1
View File
@@ -1,4 +1,4 @@
/* $ANTLR 2.7.7 (20090306): "pf.g" -> "PFCfgLexer.cpp"$ */ /* $ANTLR 2.7.7 (20100319): "pf.g" -> "PFCfgLexer.cpp"$ */
#line 43 "pf.g" #line 43 "pf.g"
// gets inserted before the antlr generated includes in the cpp // gets inserted before the antlr generated includes in the cpp
src/parsers/PFCfgLexer.hpp
+1 -1
View File
@@ -9,7 +9,7 @@
#line 11 "PFCfgLexer.hpp" #line 11 "PFCfgLexer.hpp"
#include <antlr/config.hpp> #include <antlr/config.hpp>
/* $ANTLR 2.7.7 (20090306): "pf.g" -> "PFCfgLexer.hpp"$ */ /* $ANTLR 2.7.7 (20100319): "pf.g" -> "PFCfgLexer.hpp"$ */
#include <antlr/CommonToken.hpp> #include <antlr/CommonToken.hpp>
#include <antlr/InputBuffer.hpp> #include <antlr/InputBuffer.hpp>
#include <antlr/BitSet.hpp> #include <antlr/BitSet.hpp>
src/parsers/PFCfgParser.cpp
+184 -285
View File
File diff suppressed because it is too large Load Diff
src/parsers/PFCfgParser.hpp
+1 -1
View File
@@ -9,7 +9,7 @@
#line 11 "PFCfgParser.hpp" #line 11 "PFCfgParser.hpp"
#include <antlr/config.hpp> #include <antlr/config.hpp>
/* $ANTLR 2.7.7 (20090306): "pf.g" -> "PFCfgParser.hpp"$ */ /* $ANTLR 2.7.7 (20100319): "pf.g" -> "PFCfgParser.hpp"$ */
#include <antlr/TokenStream.hpp> #include <antlr/TokenStream.hpp>
#include <antlr/TokenBuffer.hpp> #include <antlr/TokenBuffer.hpp>
#include "PFCfgParserTokenTypes.hpp" #include "PFCfgParserTokenTypes.hpp"
src/parsers/PFCfgParserTokenTypes.hpp
+2 -2
View File
@@ -1,7 +1,7 @@
#ifndef INC_PFCfgParserTokenTypes_hpp_ #ifndef INC_PFCfgParserTokenTypes_hpp_
#define INC_PFCfgParserTokenTypes_hpp_ #define INC_PFCfgParserTokenTypes_hpp_
/* $ANTLR 2.7.7 (20090306): "pf.g" -> "PFCfgParserTokenTypes.hpp"$ */ /* $ANTLR 2.7.7 (20100319): "pf.g" -> "PFCfgParserTokenTypes.hpp"$ */
#ifndef CUSTOM_API #ifndef CUSTOM_API
# define CUSTOM_API # define CUSTOM_API
@@ -134,7 +134,7 @@ struct CUSTOM_API PFCfgParserTokenTypes {
RDP = 123, RDP = 123,
RSVP = 124, RSVP = 124,
GRE = 125, GRE = 125,
ESP = 126, ESP_WORD = 126,
AH = 127, AH = 127,
EIGRP = 128, EIGRP = 128,
OSPF = 129, OSPF = 129,
src/parsers/PFCfgParserTokenTypes.txt
+2 -2
View File
@@ -1,4 +1,4 @@
// $ANTLR 2.7.7 (20090306): pf.g -> PFCfgParserTokenTypes.txt$ // $ANTLR 2.7.7 (20100319): pf.g -> PFCfgParserTokenTypes.txt$
PFCfgParser // output token vocab name PFCfgParser // output token vocab name
NEWLINE=4 NEWLINE=4
COMMENT_START=5 COMMENT_START=5
@@ -122,7 +122,7 @@ UDP="udp"=122
RDP="rdp"=123 RDP="rdp"=123
RSVP="rsvp"=124 RSVP="rsvp"=124
GRE="gre"=125 GRE="gre"=125
ESP="esp"=126 ESP_WORD="esp"=126
AH="ah"=127 AH="ah"=127
EIGRP="eigrp"=128 EIGRP="eigrp"=128
OSPF="ospf"=129 OSPF="ospf"=129
src/parsers/PIXCfgLexer.cpp
+1 -1
View File
@@ -1,4 +1,4 @@
/* $ANTLR 2.7.7 (20090306): "pix.g" -> "PIXCfgLexer.cpp"$ */ /* $ANTLR 2.7.7 (20100319): "pix.g" -> "PIXCfgLexer.cpp"$ */
#line 42 "pix.g" #line 42 "pix.g"
// gets inserted before the antlr generated includes in the cpp // gets inserted before the antlr generated includes in the cpp
src/parsers/PIXCfgLexer.hpp
+1 -1
View File
@@ -9,7 +9,7 @@
#line 11 "PIXCfgLexer.hpp" #line 11 "PIXCfgLexer.hpp"
#include <antlr/config.hpp> #include <antlr/config.hpp>
/* $ANTLR 2.7.7 (20090306): "pix.g" -> "PIXCfgLexer.hpp"$ */ /* $ANTLR 2.7.7 (20100319): "pix.g" -> "PIXCfgLexer.hpp"$ */
#include <antlr/CommonToken.hpp> #include <antlr/CommonToken.hpp>
#include <antlr/InputBuffer.hpp> #include <antlr/InputBuffer.hpp>
#include <antlr/BitSet.hpp> #include <antlr/BitSet.hpp>
src/parsers/PIXCfgParser.cpp
+11 -11
View File
@@ -1,4 +1,4 @@
/* $ANTLR 2.7.7 (20090306): "pix.g" -> "PIXCfgParser.cpp"$ */ /* $ANTLR 2.7.7 (20100319): "pix.g" -> "PIXCfgParser.cpp"$ */
#line 42 "pix.g" #line 42 "pix.g"
// gets inserted before the antlr generated includes in the cpp // gets inserted before the antlr generated includes in the cpp
@@ -2098,9 +2098,9 @@ void PIXCfgParser::ip_protocol_names() {
match(EIGRP); match(EIGRP);
break; break;
} }
case ESP: case ESP_WORD:
{ {
match(ESP); match(ESP_WORD);
break; break;
} }
case GRE: case GRE:
@@ -2722,7 +2722,7 @@ void PIXCfgParser::service_other() {
case PIM: case PIM:
case AH: case AH:
case EIGRP: case EIGRP:
case ESP: case ESP_WORD:
case GRE: case GRE:
case IGMP: case IGMP:
case IGRP: case IGRP:
@@ -3311,7 +3311,7 @@ void PIXCfgParser::protocol_object() {
case PIM: case PIM:
case AH: case AH:
case EIGRP: case EIGRP:
case ESP: case ESP_WORD:
case GRE: case GRE:
case IGMP: case IGMP:
case IGRP: case IGRP:
@@ -3353,7 +3353,7 @@ void PIXCfgParser::protocol_object() {
case PIM: case PIM:
case AH: case AH:
case EIGRP: case EIGRP:
case ESP: case ESP_WORD:
case GRE: case GRE:
case IGMP: case IGMP:
case IGRP: case IGRP:
@@ -3663,7 +3663,7 @@ void PIXCfgParser::service_object() {
case PIM: case PIM:
case AH: case AH:
case EIGRP: case EIGRP:
case ESP: case ESP_WORD:
case GRE: case GRE:
case IGMP: case IGMP:
case IGRP: case IGRP:
@@ -3687,7 +3687,7 @@ void PIXCfgParser::service_object() {
case PIM: case PIM:
case AH: case AH:
case EIGRP: case EIGRP:
case ESP: case ESP_WORD:
case GRE: case GRE:
case IGMP: case IGMP:
case IGRP: case IGRP:
@@ -4152,7 +4152,7 @@ void PIXCfgParser::rule_extended() {
case PIM: case PIM:
case AH: case AH:
case EIGRP: case EIGRP:
case ESP: case ESP_WORD:
case GRE: case GRE:
case IGMP: case IGMP:
case IGRP: case IGRP:
@@ -4575,7 +4575,7 @@ void PIXCfgParser::ip_protocols() {
case PIM: case PIM:
case AH: case AH:
case EIGRP: case EIGRP:
case ESP: case ESP_WORD:
case GRE: case GRE:
case IGMP: case IGMP:
case IGRP: case IGRP:
@@ -4594,7 +4594,7 @@ void PIXCfgParser::ip_protocols() {
case PIM: case PIM:
case AH: case AH:
case EIGRP: case EIGRP:
case ESP: case ESP_WORD:
case GRE: case GRE:
case IGMP: case IGMP:
case IGRP: case IGRP:
src/parsers/PIXCfgParser.hpp
+1 -1
View File
@@ -9,7 +9,7 @@
#line 11 "PIXCfgParser.hpp" #line 11 "PIXCfgParser.hpp"
#include <antlr/config.hpp> #include <antlr/config.hpp>
/* $ANTLR 2.7.7 (20090306): "pix.g" -> "PIXCfgParser.hpp"$ */ /* $ANTLR 2.7.7 (20100319): "pix.g" -> "PIXCfgParser.hpp"$ */
#include <antlr/TokenStream.hpp> #include <antlr/TokenStream.hpp>
#include <antlr/TokenBuffer.hpp> #include <antlr/TokenBuffer.hpp>
#include "PIXCfgParserTokenTypes.hpp" #include "PIXCfgParserTokenTypes.hpp"
src/parsers/PIXCfgParserTokenTypes.hpp
+2 -2
View File
@@ -1,7 +1,7 @@
#ifndef INC_PIXCfgParserTokenTypes_hpp_ #ifndef INC_PIXCfgParserTokenTypes_hpp_
#define INC_PIXCfgParserTokenTypes_hpp_ #define INC_PIXCfgParserTokenTypes_hpp_
/* $ANTLR 2.7.7 (20090306): "pix.g" -> "PIXCfgParserTokenTypes.hpp"$ */ /* $ANTLR 2.7.7 (20100319): "pix.g" -> "PIXCfgParserTokenTypes.hpp"$ */
#ifndef CUSTOM_API #ifndef CUSTOM_API
# define CUSTOM_API # define CUSTOM_API
@@ -26,7 +26,7 @@ struct CUSTOM_API PIXCfgParserTokenTypes {
IPV6 = 15, IPV6 = 15,
AH = 16, AH = 16,
EIGRP = 17, EIGRP = 17,
ESP = 18, ESP_WORD = 18,
GRE = 19, GRE = 19,
IGMP = 20, IGMP = 20,
IGRP = 21, IGRP = 21,
src/parsers/PIXCfgParserTokenTypes.txt
+2 -2
View File
@@ -1,4 +1,4 @@
// $ANTLR 2.7.7 (20090306): pix.g -> PIXCfgParserTokenTypes.txt$ // $ANTLR 2.7.7 (20100319): pix.g -> PIXCfgParserTokenTypes.txt$
PIXCfgParser // output token vocab name PIXCfgParser // output token vocab name
NEWLINE=4 NEWLINE=4
QUIT="quit"=5 QUIT="quit"=5
@@ -14,7 +14,7 @@ WORD=14
IPV6=15 IPV6=15
AH="ah"=16 AH="ah"=16
EIGRP="eigrp"=17 EIGRP="eigrp"=17
ESP="esp"=18 ESP_WORD="esp"=18
GRE="gre"=19 GRE="gre"=19
IGMP="igmp"=20 IGMP="igmp"=20
IGRP="igrp"=21 IGRP="igrp"=21
src/parsers/pf.g
+2 -2
View File
@@ -1107,7 +1107,7 @@ proto_def :
) )
; ;
proto_name : (IP | ICMP | IGMP | TCP | UDP | RDP | RSVP | GRE | ESP | AH | proto_name : (IP | ICMP | IGMP | TCP | UDP | RDP | RSVP | GRE | ESP_WORD | AH |
EIGRP | OSPF | IPIP | VRRP | L2TP | ISIS ) EIGRP | OSPF | IPIP | VRRP | L2TP | ISIS )
{ {
importer->proto_list.push_back(LT(0)->getText()); importer->proto_list.push_back(LT(0)->getText());
@@ -1894,7 +1894,7 @@ tokens
AH = "ah"; AH = "ah";
EIGRP = "eigrp"; EIGRP = "eigrp";
ESP = "esp"; ESP_WORD = "esp";
GRE = "gre"; GRE = "gre";
IGMP = "igmp"; IGMP = "igmp";
IGRP = "igrp"; IGRP = "igrp";
src/parsers/pix.g
+2 -2
View File
@@ -247,7 +247,7 @@ name_entry_ipv6 : IPV6 WORD
// these are used in access-list and named object definitions // these are used in access-list and named object definitions
// //
ip_protocol_names : ( ip_protocol_names : (
AH | EIGRP | ESP | GRE | AH | EIGRP | ESP_WORD | GRE |
IGMP | IGRP | IP | IPINIP | IPSEC | IGMP | IGRP | IP | IPINIP | IPSEC |
NOS | OSPF | PCP | PIM | PPTP | SNP ) NOS | OSPF | PCP | PIM | PPTP | SNP )
; ;
@@ -2363,7 +2363,7 @@ tokens
AH = "ah"; AH = "ah";
EIGRP = "eigrp"; EIGRP = "eigrp";
ESP = "esp"; ESP_WORD = "esp";
GRE = "gre"; GRE = "gre";
IGMP = "igmp"; IGMP = "igmp";
IGRP = "igrp"; IGRP = "igrp";