onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-19 09:47:20 +01:00
Code Issues Releases Wiki Activity

see #2248 fixed handling of named service objects with port op "neq"

Browse Source
This commit is contained in:
Vadim Kurland 2011-03-20 12:24:49 -07:00
parent ccab39bcbd
commit 1577bca547
10 changed files with 255 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -7,7 +7,7 @@ FWB_MICRO_VERSION=0
# build number is like "nano" version number. I am incrementing build
# number during development cycle
#
BUILD_NUM="3503"
BUILD_NUM="3504"
VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM"

2
VERSION.h
View File

@ -1,2 +1,2 @@
#define VERSION "4.2.0.3503"
#define VERSION "4.2.0.3504"
#define GENERATION "4.2"

2
packaging/fwbuilder-static-qt.spec
View File

@ -3,7 +3,7 @@
%define name fwbuilder
%define version 4.2.0.3503
%define version 4.2.0.3504
%define release 1
%if "%_vendor" == "MandrakeSoft"

2
packaging/fwbuilder.control
View File

@ -4,6 +4,6 @@ Replaces: fwbuilder (<=4.1.1-1), fwbuilder-common, fwbuilder-bsd, fwbuilder-linu
Priority: extra
Section: checkinstall
Maintainer: vadim@fwbuilder.org
Version: 4.2.0.3503-1
Version: 4.2.0.3504-1
Depends: libqt4-gui (>= 4.3.0), libxml2, libxslt1.1, libsnmp | libsnmp15
Description: Firewall Builder GUI and policy compilers

2
packaging/fwbuilder.spec
View File

@ -1,6 +1,6 @@
%define name fwbuilder
%define version 4.2.0.3503
%define version 4.2.0.3504
%define release 1
%if "%_vendor" == "MandrakeSoft"

14
src/import/PIXImporter.cpp
View File

@ -418,13 +418,17 @@ void PIXImporter::commitNamedICMPServiceObject()
void PIXImporter::commitNamedTCPUDPServiceObject()
{
ObjectSignature sig;
if (protocol == "tcp") sig = packObjectSignatureTCPService();
if (protocol == "udp") sig = packObjectSignatureUDPService();
FWObject *obj;
// have to use createTCPService because it processes "neq" port
// operators and may create a group with two services nstead of
// just tcp service. Same for udp.
if (protocol == "tcp") obj = createTCPService();
if (protocol == "udp") obj = createUDPService();
sig.object_name = named_object_name;
service_maker->promoteToNamedObject(obj,
named_object_name.toUtf8().constData());
current_named_object = commitObject(service_maker->createObject(sig));
current_named_object = commitObject(obj);
named_objects_registry[named_object_name] = current_named_object;
}

50
src/import/objectMaker.cpp
View File

@ -29,26 +29,27 @@
#include "fwbuilder/DNSName.h"
#include "fwbuilder/FWObject.h"
#include "fwbuilder/FWObjectDatabase.h"
#include "fwbuilder/ICMPService.h"
#include "fwbuilder/FWOptions.h"
#include "fwbuilder/FWReference.h"
#include "fwbuilder/Host.h"
#include "fwbuilder/ICMP6Service.h"
#include "fwbuilder/ICMPService.h"
#include "fwbuilder/IPService.h"
#include "fwbuilder/IPv4.h"
#include "fwbuilder/IPv6.h"
#include "fwbuilder/Library.h"
#include "fwbuilder/Network.h"
#include "fwbuilder/NetworkIPv6.h"
#include "fwbuilder/ObjectGroup.h"
#include "fwbuilder/Resources.h"
#include "fwbuilder/Rule.h"
#include "fwbuilder/RuleSet.h"
#include "fwbuilder/ServiceGroup.h"
#include "fwbuilder/TCPService.h"
#include "fwbuilder/TagService.h"
#include "fwbuilder/UDPService.h"
#include "fwbuilder/physAddress.h"
#include "fwbuilder/Rule.h"
#include "fwbuilder/RuleSet.h"
#include "fwbuilder/FWReference.h"
#include "fwbuilder/Host.h"
#include "fwbuilder/FWOptions.h"
#include "QStringListOperators.h"
#include "getProtoByName.h"
#include "getServByName.h"
@ -478,6 +479,10 @@ QString ObjectSignature::ObjectSignature::toString() const
if (type_name == TagService::TYPENAME)
sig << tag;
if (type_name == ServiceGroup::TYPENAME ||
type_name == ObjectGroup::TYPENAME)
sig << group_children_ids;
return sig.join("| |");
}
@ -649,6 +654,29 @@ void* ObjectSignature::dispatch(DNSName *obj, void*)
return this;
}
void* ObjectSignature::dispatch(ServiceGroup *obj, void*)
{
object_name = QString::fromUtf8(obj->getName().c_str());
type_name = obj->getTypeName().c_str();
for(FWObject::iterator it=obj->begin(); it!=obj->end(); ++it)
{
FWObject *c = FWReference::getObject(*it);
group_children_ids << c->getId();
}
return this;
}
void* ObjectSignature::dispatch(ObjectGroup *obj, void*)
{
object_name = QString::fromUtf8(obj->getName().c_str());
type_name = obj->getTypeName().c_str();
for(FWObject::iterator it=obj->begin(); it!=obj->end(); ++it)
{
FWObject *c = FWReference::getObject(*it);
group_children_ids << c->getId();
}
return this;
}
//****************************************************************
@ -691,6 +719,14 @@ void ObjectMaker::registerAnonymousObject(const ObjectSignature &sig, FWObject*
anon_object_registry[anon_sig.toString()] = (obj!=NULL) ? obj->getId() : -1;
}
void ObjectMaker::promoteToNamedObject(FWObject *obj, const std::string &objName)
{
ObjectSignature sig;
obj->setName(objName);
obj->dispatch(&sig, (void*)(NULL));
registerNamedObject(sig, obj);
}
//****************************************************************
FWObject* ObjectMaker::createObject(const std::string &objType,

8
src/import/objectMaker.h
View File

@ -48,6 +48,8 @@ namespace libfwbuilder
class Library;
class Network;
class NetworkIPv6;
class ObjectGroup;
class ServiceGroup;
class TCPService;
class TagService;
class UDPService;
@ -122,6 +124,8 @@ public:
// tag service
QString tag;
QList<int> group_children_ids;
// convenience methods that populate various attributes from
// strings taken from imported configs
void setProtocol(const QString &s);
@ -165,6 +169,8 @@ public:
virtual void* dispatch(libfwbuilder::CustomService*, void*);
virtual void* dispatch(libfwbuilder::TagService*, void*);
virtual void* dispatch(libfwbuilder::DNSName*, void*);
virtual void* dispatch(libfwbuilder::ObjectGroup*, void*);
virtual void* dispatch(libfwbuilder::ServiceGroup*, void*);
};
@ -203,6 +209,8 @@ public:
const std::string &objType,
const std::string &objName);
void promoteToNamedObject(libfwbuilder::FWObject *obj,
const std::string &objName);
};
#endif

294
src/parsers/PIXCfgParser.cpp
View File

@ -47,6 +47,7 @@ PIXCfgParser::PIXCfgParser(const ANTLR_USE_NAMESPACE(antlr)ParserSharedInputStat
}
void PIXCfgParser::cfgfile() {
Tracer traceInOut(this, "cfgfile");
try { // for error handling
{ // ( ... )+
@ -177,6 +178,7 @@ void PIXCfgParser::cfgfile() {
}
void PIXCfgParser::comment() {
Tracer traceInOut(this, "comment");
try { // for error handling
{
@ -209,6 +211,7 @@ void PIXCfgParser::comment() {
}
void PIXCfgParser::version() {
Tracer traceInOut(this, "version");
try { // for error handling
{
@ -239,7 +242,7 @@ void PIXCfgParser::version() {
*dbg << "VERSION " << LT(0)->getText() << std::endl;
consumeUntil(NEWLINE);
#line 243 "PIXCfgParser.cpp"
#line 246 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -253,6 +256,7 @@ void PIXCfgParser::version() {
}
void PIXCfgParser::hostname() {
Tracer traceInOut(this, "hostname");
try { // for error handling
match(HOSTNAME);
@ -283,7 +287,7 @@ void PIXCfgParser::hostname() {
<< "LT0=" << LT(0)->getText()
<< std::endl;
#line 287 "PIXCfgParser.cpp"
#line 291 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -297,6 +301,7 @@ void PIXCfgParser::hostname() {
}
void PIXCfgParser::ip_access_list_ext() {
Tracer traceInOut(this, "ip_access_list_ext");
ANTLR_USE_NAMESPACE(antlr)RefToken name = ANTLR_USE_NAMESPACE(antlr)nullToken;
try { // for error handling
@ -314,7 +319,7 @@ void PIXCfgParser::ip_access_list_ext() {
*dbg << name->getLine() << ":"
<< " ACL ext " << name->getText() << std::endl;
#line 318 "PIXCfgParser.cpp"
#line 323 "PIXCfgParser.cpp"
}
{
switch ( LA(1)) {
@ -356,7 +361,7 @@ void PIXCfgParser::ip_access_list_ext() {
*dbg << LT(0)->getLine() << ":"
<< " ACL line end" << std::endl << std::endl;
#line 360 "PIXCfgParser.cpp"
#line 365 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -370,6 +375,7 @@ void PIXCfgParser::ip_access_list_ext() {
}
void PIXCfgParser::community_list_command() {
Tracer traceInOut(this, "community_list_command");
try { // for error handling
match(IP);
@ -379,7 +385,7 @@ void PIXCfgParser::community_list_command() {
consumeUntil(NEWLINE);
#line 383 "PIXCfgParser.cpp"
#line 389 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -393,6 +399,7 @@ void PIXCfgParser::community_list_command() {
}
void PIXCfgParser::unknown_ip_command() {
Tracer traceInOut(this, "unknown_ip_command");
try { // for error handling
match(IP);
@ -402,7 +409,7 @@ void PIXCfgParser::unknown_ip_command() {
consumeUntil(NEWLINE);
#line 406 "PIXCfgParser.cpp"
#line 413 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -416,6 +423,7 @@ void PIXCfgParser::unknown_ip_command() {
}
void PIXCfgParser::intrface() {
Tracer traceInOut(this, "intrface");
ANTLR_USE_NAMESPACE(antlr)RefToken in = ANTLR_USE_NAMESPACE(antlr)nullToken;
try { // for error handling
@ -431,7 +439,7 @@ void PIXCfgParser::intrface() {
<< " INTRFACE: " << in->getText() << std::endl;
consumeUntil(NEWLINE);
#line 435 "PIXCfgParser.cpp"
#line 443 "PIXCfgParser.cpp"
}
{
switch ( LA(1)) {
@ -478,6 +486,7 @@ void PIXCfgParser::intrface() {
}
void PIXCfgParser::controller() {
Tracer traceInOut(this, "controller");
try { // for error handling
match(CONTROLLER);
@ -487,7 +496,7 @@ void PIXCfgParser::controller() {
importer->clearCurrentInterface();
consumeUntil(NEWLINE);
#line 491 "PIXCfgParser.cpp"
#line 500 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -501,6 +510,7 @@ void PIXCfgParser::controller() {
}
void PIXCfgParser::access_list_commands() {
Tracer traceInOut(this, "access_list_commands");
ANTLR_USE_NAMESPACE(antlr)RefToken acl_num = ANTLR_USE_NAMESPACE(antlr)nullToken;
try { // for error handling
@ -517,7 +527,7 @@ void PIXCfgParser::access_list_commands() {
*dbg << acl_num->getLine() << ":"
<< " ACL #" << acl_num->getText() << " ";
#line 521 "PIXCfgParser.cpp"
#line 531 "PIXCfgParser.cpp"
}
{
switch ( LA(1)) {
@ -554,6 +564,7 @@ void PIXCfgParser::access_list_commands() {
}
void PIXCfgParser::exit() {
Tracer traceInOut(this, "exit");
try { // for error handling
match(EXIT);
@ -569,6 +580,7 @@ void PIXCfgParser::exit() {
}
void PIXCfgParser::certificate() {
Tracer traceInOut(this, "certificate");
try { // for error handling
match(CERTIFICATE);
@ -579,7 +591,7 @@ void PIXCfgParser::certificate() {
consumeUntil(NEWLINE);
consumeUntil(QUIT);
#line 583 "PIXCfgParser.cpp"
#line 595 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -593,6 +605,7 @@ void PIXCfgParser::certificate() {
}
void PIXCfgParser::quit() {
Tracer traceInOut(this, "quit");
try { // for error handling
match(QUIT);
@ -601,7 +614,7 @@ void PIXCfgParser::quit() {
consumeUntil(NEWLINE);
#line 605 "PIXCfgParser.cpp"
#line 618 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -615,6 +628,7 @@ void PIXCfgParser::quit() {
}
void PIXCfgParser::names_section() {
Tracer traceInOut(this, "names_section");
try { // for error handling
match(NAMES);
@ -627,7 +641,7 @@ void PIXCfgParser::names_section() {
"Import of configuration that uses \"names\" "
"is not supported at this time");
#line 631 "PIXCfgParser.cpp"
#line 645 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -641,6 +655,7 @@ void PIXCfgParser::names_section() {
}
void PIXCfgParser::name_entry() {
Tracer traceInOut(this, "name_entry");
ANTLR_USE_NAMESPACE(antlr)RefToken a = ANTLR_USE_NAMESPACE(antlr)nullToken;
ANTLR_USE_NAMESPACE(antlr)RefToken n = ANTLR_USE_NAMESPACE(antlr)nullToken;
ANTLR_USE_NAMESPACE(antlr)RefToken v6 = ANTLR_USE_NAMESPACE(antlr)nullToken;
@ -681,7 +696,7 @@ void PIXCfgParser::name_entry() {
consumeUntil(NEWLINE);
}
#line 685 "PIXCfgParser.cpp"
#line 700 "PIXCfgParser.cpp"
}
break;
}
@ -702,6 +717,7 @@ void PIXCfgParser::name_entry() {
}
void PIXCfgParser::named_object_network() {
Tracer traceInOut(this, "named_object_network");
ANTLR_USE_NAMESPACE(antlr)RefToken name = ANTLR_USE_NAMESPACE(antlr)nullToken;
try { // for error handling
@ -718,7 +734,7 @@ void PIXCfgParser::named_object_network() {
*dbg << name->getLine() << ":"
<< " Named Object " << name->getText() << std::endl;
#line 722 "PIXCfgParser.cpp"
#line 738 "PIXCfgParser.cpp"
}
{ // ( ... )*
for (;;) {
@ -745,6 +761,7 @@ void PIXCfgParser::named_object_network() {
}
void PIXCfgParser::named_object_service() {
Tracer traceInOut(this, "named_object_service");
ANTLR_USE_NAMESPACE(antlr)RefToken name = ANTLR_USE_NAMESPACE(antlr)nullToken;
try { // for error handling
@ -761,7 +778,7 @@ void PIXCfgParser::named_object_service() {
*dbg << name->getLine() << ":"
<< " Named Object " << name->getText() << std::endl;
#line 765 "PIXCfgParser.cpp"
#line 782 "PIXCfgParser.cpp"
}
{ // ( ... )*
for (;;) {
@ -788,6 +805,7 @@ void PIXCfgParser::named_object_service() {
}
void PIXCfgParser::object_group_network() {
Tracer traceInOut(this, "object_group_network");
ANTLR_USE_NAMESPACE(antlr)RefToken name = ANTLR_USE_NAMESPACE(antlr)nullToken;
try { // for error handling
@ -804,7 +822,7 @@ void PIXCfgParser::object_group_network() {
*dbg << name->getLine() << ":"
<< " Object Group " << name->getText() << std::endl;
#line 808 "PIXCfgParser.cpp"
#line 826 "PIXCfgParser.cpp"
}
{ // ( ... )+
int _cnt48=0;
@ -832,6 +850,7 @@ void PIXCfgParser::object_group_network() {
}
void PIXCfgParser::object_group_service() {
Tracer traceInOut(this, "object_group_service");
ANTLR_USE_NAMESPACE(antlr)RefToken name = ANTLR_USE_NAMESPACE(antlr)nullToken;
try { // for error handling
@ -848,7 +867,7 @@ void PIXCfgParser::object_group_service() {
*dbg << name->getLine() << ":"
<< " Object Group " << name->getText() << std::endl;
#line 852 "PIXCfgParser.cpp"
#line 871 "PIXCfgParser.cpp"
}
{ // ( ... )+
int _cnt79=0;
@ -876,6 +895,7 @@ void PIXCfgParser::object_group_service() {
}
void PIXCfgParser::object_group_protocol() {
Tracer traceInOut(this, "object_group_protocol");
ANTLR_USE_NAMESPACE(antlr)RefToken name = ANTLR_USE_NAMESPACE(antlr)nullToken;
try { // for error handling
@ -892,7 +912,7 @@ void PIXCfgParser::object_group_protocol() {
*dbg << name->getLine() << ":"
<< " Object Group " << name->getText() << std::endl;
#line 896 "PIXCfgParser.cpp"
#line 916 "PIXCfgParser.cpp"
}
{ // ( ... )+
int _cnt60=0;
@ -920,6 +940,7 @@ void PIXCfgParser::object_group_protocol() {
}
void PIXCfgParser::object_group_icmp_8_0() {
Tracer traceInOut(this, "object_group_icmp_8_0");
ANTLR_USE_NAMESPACE(antlr)RefToken name = ANTLR_USE_NAMESPACE(antlr)nullToken;
try { // for error handling
@ -936,7 +957,7 @@ void PIXCfgParser::object_group_icmp_8_0() {
*dbg << name->getLine() << ":"
<< " Object Group " << name->getText() << std::endl;
#line 940 "PIXCfgParser.cpp"
#line 961 "PIXCfgParser.cpp"
}
{ // ( ... )+
int _cnt68=0;
@ -964,6 +985,7 @@ void PIXCfgParser::object_group_icmp_8_0() {
}
void PIXCfgParser::object_group_icmp_8_3() {
Tracer traceInOut(this, "object_group_icmp_8_3");
ANTLR_USE_NAMESPACE(antlr)RefToken name = ANTLR_USE_NAMESPACE(antlr)nullToken;
try { // for error handling
@ -980,7 +1002,7 @@ void PIXCfgParser::object_group_icmp_8_3() {
*dbg << name->getLine() << ":"
<< " Object Group " << name->getText() << std::endl;
#line 984 "PIXCfgParser.cpp"
#line 1006 "PIXCfgParser.cpp"
}
{ // ( ... )+
int _cnt71=0;
@ -1008,6 +1030,7 @@ void PIXCfgParser::object_group_icmp_8_3() {
}
void PIXCfgParser::crypto() {
Tracer traceInOut(this, "crypto");
try { // for error handling
match(CRYPTO);
@ -1016,7 +1039,7 @@ void PIXCfgParser::crypto() {
consumeUntil(NEWLINE);
#line 1020 "PIXCfgParser.cpp"
#line 1043 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -1030,6 +1053,7 @@ void PIXCfgParser::crypto() {
}
void PIXCfgParser::unknown_command() {
Tracer traceInOut(this, "unknown_command");
try { // for error handling
match(WORD);
@ -1038,7 +1062,7 @@ void PIXCfgParser::unknown_command() {
consumeUntil(NEWLINE);
#line 1042 "PIXCfgParser.cpp"
#line 1066 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -1052,6 +1076,7 @@ void PIXCfgParser::unknown_command() {
}
void PIXCfgParser::ip_protocol_names() {
Tracer traceInOut(this, "ip_protocol_names");
try { // for error handling
{
@ -1149,6 +1174,7 @@ void PIXCfgParser::ip_protocol_names() {
}
void PIXCfgParser::named_object_network_parameters() {
Tracer traceInOut(this, "named_object_network_parameters");
try { // for error handling
{
@ -1196,6 +1222,7 @@ void PIXCfgParser::named_object_network_parameters() {
}
void PIXCfgParser::named_object_nat() {
Tracer traceInOut(this, "named_object_nat");
try { // for error handling
match(NAT);
@ -1208,7 +1235,7 @@ void PIXCfgParser::named_object_nat() {
"is not supported at this time");
consumeUntil(NEWLINE);
#line 1212 "PIXCfgParser.cpp"
#line 1239 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -1222,6 +1249,7 @@ void PIXCfgParser::named_object_nat() {
}
void PIXCfgParser::host_addr() {
Tracer traceInOut(this, "host_addr");
ANTLR_USE_NAMESPACE(antlr)RefToken h = ANTLR_USE_NAMESPACE(antlr)nullToken;
ANTLR_USE_NAMESPACE(antlr)RefToken v6 = ANTLR_USE_NAMESPACE(antlr)nullToken;
@ -1267,7 +1295,7 @@ void PIXCfgParser::host_addr() {
consumeUntil(NEWLINE);
}
#line 1271 "PIXCfgParser.cpp"
#line 1299 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -1281,6 +1309,7 @@ void PIXCfgParser::host_addr() {
}
void PIXCfgParser::range_addr() {
Tracer traceInOut(this, "range_addr");
ANTLR_USE_NAMESPACE(antlr)RefToken r1 = ANTLR_USE_NAMESPACE(antlr)nullToken;
ANTLR_USE_NAMESPACE(antlr)RefToken r2 = ANTLR_USE_NAMESPACE(antlr)nullToken;
@ -1301,7 +1330,7 @@ void PIXCfgParser::range_addr() {
importer->commitNamedAddressRangeObject();
*dbg << r1->getText() << "/" << r2->getText();
#line 1305 "PIXCfgParser.cpp"
#line 1334 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -1315,6 +1344,7 @@ void PIXCfgParser::range_addr() {
}
void PIXCfgParser::subnet_addr() {
Tracer traceInOut(this, "subnet_addr");
ANTLR_USE_NAMESPACE(antlr)RefToken a = ANTLR_USE_NAMESPACE(antlr)nullToken;
ANTLR_USE_NAMESPACE(antlr)RefToken nm = ANTLR_USE_NAMESPACE(antlr)nullToken;
ANTLR_USE_NAMESPACE(antlr)RefToken v6 = ANTLR_USE_NAMESPACE(antlr)nullToken;
@ -1365,7 +1395,7 @@ void PIXCfgParser::subnet_addr() {
consumeUntil(NEWLINE);
}
#line 1369 "PIXCfgParser.cpp"
#line 1399 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -1379,6 +1409,7 @@ void PIXCfgParser::subnet_addr() {
}
void PIXCfgParser::named_object_description() {
Tracer traceInOut(this, "named_object_description");
try { // for error handling
match(DESCRIPTION);
@ -1396,7 +1427,7 @@ void PIXCfgParser::named_object_description() {
importer->setNamedObjectDescription(descr);
*dbg << " DESCRIPTION " << descr << std::endl;
#line 1400 "PIXCfgParser.cpp"
#line 1431 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -1410,6 +1441,7 @@ void PIXCfgParser::named_object_description() {
}
void PIXCfgParser::named_object_service_parameters() {
Tracer traceInOut(this, "named_object_service_parameters");
try { // for error handling
{
@ -1445,6 +1477,7 @@ void PIXCfgParser::named_object_service_parameters() {
}
void PIXCfgParser::service_icmp() {
Tracer traceInOut(this, "service_icmp");
ANTLR_USE_NAMESPACE(antlr)RefToken icmp_type = ANTLR_USE_NAMESPACE(antlr)nullToken;
ANTLR_USE_NAMESPACE(antlr)RefToken icmp_word = ANTLR_USE_NAMESPACE(antlr)nullToken;
@ -1462,7 +1495,7 @@ void PIXCfgParser::service_icmp() {
importer->icmp_type = LT(0)->getText();
#line 1466 "PIXCfgParser.cpp"
#line 1499 "PIXCfgParser.cpp"
}
break;
}
@ -1475,7 +1508,7 @@ void PIXCfgParser::service_icmp() {
importer->icmp_spec = icmp_word->getText();
#line 1479 "PIXCfgParser.cpp"
#line 1512 "PIXCfgParser.cpp"
}
break;
}
@ -1492,7 +1525,7 @@ void PIXCfgParser::service_icmp() {
importer->commitNamedICMPServiceObject();
*dbg << "NAMED OBJECT SERVICE ICMP " << LT(0)->getText() << " ";
#line 1496 "PIXCfgParser.cpp"
#line 1529 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -1506,6 +1539,7 @@ void PIXCfgParser::service_icmp() {
}
void PIXCfgParser::service_icmp6() {
Tracer traceInOut(this, "service_icmp6");
try { // for error handling
match(SERVICE);
@ -1538,7 +1572,7 @@ void PIXCfgParser::service_icmp6() {
*dbg << "NAMED OBJECT SERVICE ICMP6 " << LT(0)->getText() << " ";
consumeUntil(NEWLINE);
#line 1542 "PIXCfgParser.cpp"
#line 1576 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -1552,6 +1586,7 @@ void PIXCfgParser::service_icmp6() {
}
void PIXCfgParser::service_tcp_udp() {
Tracer traceInOut(this, "service_tcp_udp");
try { // for error handling
match(SERVICE);
@ -1579,7 +1614,7 @@ void PIXCfgParser::service_tcp_udp() {
importer->protocol = LT(0)->getText();
*dbg << "NAMED OBJECT SERVICE " << LT(0)->getText() << " ";
#line 1583 "PIXCfgParser.cpp"
#line 1618 "PIXCfgParser.cpp"
}
{
switch ( LA(1)) {
@ -1672,7 +1707,7 @@ void PIXCfgParser::service_tcp_udp() {
importer->setCurrentLineNumber(LT(0)->getLine());
importer->commitNamedTCPUDPServiceObject();
#line 1676 "PIXCfgParser.cpp"
#line 1711 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -1686,6 +1721,7 @@ void PIXCfgParser::service_tcp_udp() {
}
void PIXCfgParser::service_other() {
Tracer traceInOut(this, "service_other");
try { // for error handling
match(SERVICE);
@ -1729,7 +1765,7 @@ void PIXCfgParser::service_other() {
importer->commitNamedIPServiceObject();
*dbg << "NAMED OBJECT SERVICE " << LT(0)->getText() << " ";
#line 1733 "PIXCfgParser.cpp"
#line 1769 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -1743,6 +1779,7 @@ void PIXCfgParser::service_other() {
}
void PIXCfgParser::src_port_spec() {
Tracer traceInOut(this, "src_port_spec");
try { // for error handling
match(SOURCE);
@ -1752,7 +1789,7 @@ void PIXCfgParser::src_port_spec() {
importer->SaveTmpPortToSrc();
#line 1756 "PIXCfgParser.cpp"
#line 1793 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -1766,6 +1803,7 @@ void PIXCfgParser::src_port_spec() {
}
void PIXCfgParser::dst_port_spec() {
Tracer traceInOut(this, "dst_port_spec");
try { // for error handling
{
@ -1795,7 +1833,7 @@ void PIXCfgParser::dst_port_spec() {
importer->SaveTmpPortToDst();
#line 1799 "PIXCfgParser.cpp"
#line 1837 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -1809,6 +1847,7 @@ void PIXCfgParser::dst_port_spec() {
}
void PIXCfgParser::xoperator() {
Tracer traceInOut(this, "xoperator");
try { // for error handling
switch ( LA(1)) {
@ -1842,6 +1881,7 @@ void PIXCfgParser::xoperator() {
}
void PIXCfgParser::object_group_network_parameters() {
Tracer traceInOut(this, "object_group_network_parameters");
try { // for error handling
match(NEWLINE);
@ -1880,6 +1920,7 @@ void PIXCfgParser::object_group_network_parameters() {
}
void PIXCfgParser::object_group_description() {
Tracer traceInOut(this, "object_group_description");
try { // for error handling
match(DESCRIPTION);
@ -1897,7 +1938,7 @@ void PIXCfgParser::object_group_description() {
importer->setObjectGroupDescription(descr);
*dbg << " DESCRIPTION " << descr << std::endl;
#line 1901 "PIXCfgParser.cpp"
#line 1942 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -1911,6 +1952,7 @@ void PIXCfgParser::object_group_description() {
}
void PIXCfgParser::group_object() {
Tracer traceInOut(this, "group_object");
ANTLR_USE_NAMESPACE(antlr)RefToken name = ANTLR_USE_NAMESPACE(antlr)nullToken;
try { // for error handling
@ -1925,7 +1967,7 @@ void PIXCfgParser::group_object() {
importer->addNamedObjectToObjectGroup(name->getText());
*dbg << " GROUP MEMBER " << name->getLine() << std::endl;
#line 1929 "PIXCfgParser.cpp"
#line 1971 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -1939,6 +1981,7 @@ void PIXCfgParser::group_object() {
}
void PIXCfgParser::network_object() {
Tracer traceInOut(this, "network_object");
ANTLR_USE_NAMESPACE(antlr)RefToken a = ANTLR_USE_NAMESPACE(antlr)nullToken;
ANTLR_USE_NAMESPACE(antlr)RefToken nm = ANTLR_USE_NAMESPACE(antlr)nullToken;
ANTLR_USE_NAMESPACE(antlr)RefToken v6 = ANTLR_USE_NAMESPACE(antlr)nullToken;
@ -1954,7 +1997,7 @@ void PIXCfgParser::network_object() {
importer->clearTempVars();
importer->setCurrentLineNumber(LT(0)->getLine());
#line 1958 "PIXCfgParser.cpp"
#line 2001 "PIXCfgParser.cpp"
}
{
switch ( LA(1)) {
@ -2002,7 +2045,7 @@ void PIXCfgParser::network_object() {
consumeUntil(NEWLINE);
}
#line 2006 "PIXCfgParser.cpp"
#line 2049 "PIXCfgParser.cpp"
}
break;
}
@ -2046,7 +2089,7 @@ void PIXCfgParser::network_object() {
consumeUntil(NEWLINE);
}
#line 2050 "PIXCfgParser.cpp"
#line 2093 "PIXCfgParser.cpp"
}
break;
}
@ -2061,7 +2104,7 @@ void PIXCfgParser::network_object() {
importer->addNamedObjectToObjectGroup(name->getText());
*dbg << " GROUP MEMBER " << name->getLine() << std::endl;
#line 2065 "PIXCfgParser.cpp"
#line 2108 "PIXCfgParser.cpp"
}
break;
}
@ -2083,6 +2126,7 @@ void PIXCfgParser::network_object() {
}
void PIXCfgParser::object_group_protocol_parameters() {
Tracer traceInOut(this, "object_group_protocol_parameters");
try { // for error handling
match(NEWLINE);
@ -2121,6 +2165,7 @@ void PIXCfgParser::object_group_protocol_parameters() {
}
void PIXCfgParser::protocol_object() {
Tracer traceInOut(this, "protocol_object");
ANTLR_USE_NAMESPACE(antlr)RefToken name = ANTLR_USE_NAMESPACE(antlr)nullToken;
try { // for error handling
@ -2131,7 +2176,7 @@ void PIXCfgParser::protocol_object() {
importer->clearTempVars();
importer->setCurrentLineNumber(LT(0)->getLine());
#line 2135 "PIXCfgParser.cpp"
#line 2180 "PIXCfgParser.cpp"
}
{
switch ( LA(1)) {
@ -2210,7 +2255,7 @@ void PIXCfgParser::protocol_object() {
importer->addIPServiceToObjectGroup();
*dbg << " GROUP MEMBER " << LT(0)->getText() << " ";
#line 2214 "PIXCfgParser.cpp"
#line 2259 "PIXCfgParser.cpp"
}
break;
}
@ -2224,7 +2269,7 @@ void PIXCfgParser::protocol_object() {
"Parser warning: IPv6 import is not supported. ");
consumeUntil(NEWLINE);
#line 2228 "PIXCfgParser.cpp"
#line 2273 "PIXCfgParser.cpp"
}
break;
}
@ -2239,7 +2284,7 @@ void PIXCfgParser::protocol_object() {
importer->addNamedObjectToObjectGroup(name->getText());
*dbg << " GROUP MEMBER " << name->getLine() << std::endl;
#line 2243 "PIXCfgParser.cpp"
#line 2288 "PIXCfgParser.cpp"
}
break;
}
@ -2261,6 +2306,7 @@ void PIXCfgParser::protocol_object() {
}
void PIXCfgParser::object_group_icmp_parameters() {
Tracer traceInOut(this, "object_group_icmp_parameters");
try { // for error handling
match(NEWLINE);
@ -2299,6 +2345,7 @@ void PIXCfgParser::object_group_icmp_parameters() {
}
void PIXCfgParser::icmp_object() {
Tracer traceInOut(this, "icmp_object");
ANTLR_USE_NAMESPACE(antlr)RefToken icmp_type = ANTLR_USE_NAMESPACE(antlr)nullToken;
ANTLR_USE_NAMESPACE(antlr)RefToken icmp_word = ANTLR_USE_NAMESPACE(antlr)nullToken;
ANTLR_USE_NAMESPACE(antlr)RefToken name = ANTLR_USE_NAMESPACE(antlr)nullToken;
@ -2311,7 +2358,7 @@ void PIXCfgParser::icmp_object() {
importer->clearTempVars();
importer->setCurrentLineNumber(LT(0)->getLine());
#line 2315 "PIXCfgParser.cpp"
#line 2362 "PIXCfgParser.cpp"
}
{
switch ( LA(1)) {
@ -2329,7 +2376,7 @@ void PIXCfgParser::icmp_object() {
importer->icmp_type = LT(0)->getText();
#line 2333 "PIXCfgParser.cpp"
#line 2380 "PIXCfgParser.cpp"
}
break;
}
@ -2342,7 +2389,7 @@ void PIXCfgParser::icmp_object() {
importer->icmp_spec = icmp_word->getText();
#line 2346 "PIXCfgParser.cpp"
#line 2393 "PIXCfgParser.cpp"
}
break;
}
@ -2358,7 +2405,7 @@ void PIXCfgParser::icmp_object() {
importer->addICMPServiceToObjectGroup();
*dbg << " SERVICE ICMP " << LT(0)->getText() << " ";
#line 2362 "PIXCfgParser.cpp"
#line 2409 "PIXCfgParser.cpp"
}
break;
}
@ -2373,7 +2420,7 @@ void PIXCfgParser::icmp_object() {
importer->addNamedObjectToObjectGroup(name->getText());
*dbg << " GROUP MEMBER " << name->getLine() << std::endl;
#line 2377 "PIXCfgParser.cpp"
#line 2424 "PIXCfgParser.cpp"
}
break;
}
@ -2395,6 +2442,7 @@ void PIXCfgParser::icmp_object() {
}
void PIXCfgParser::object_group_service_parameters() {
Tracer traceInOut(this, "object_group_service_parameters");
try { // for error handling
match(NEWLINE);
@ -2433,6 +2481,7 @@ void PIXCfgParser::object_group_service_parameters() {
}
void PIXCfgParser::service_object() {
Tracer traceInOut(this, "service_object");
ANTLR_USE_NAMESPACE(antlr)RefToken icmp_type = ANTLR_USE_NAMESPACE(antlr)nullToken;
ANTLR_USE_NAMESPACE(antlr)RefToken icmp_word = ANTLR_USE_NAMESPACE(antlr)nullToken;
ANTLR_USE_NAMESPACE(antlr)RefToken name = ANTLR_USE_NAMESPACE(antlr)nullToken;
@ -2445,7 +2494,7 @@ void PIXCfgParser::service_object() {
importer->clearTempVars();
importer->setCurrentLineNumber(LT(0)->getLine());
#line 2449 "PIXCfgParser.cpp"
#line 2498 "PIXCfgParser.cpp"
}
{
switch ( LA(1)) {
@ -2506,7 +2555,7 @@ void PIXCfgParser::service_object() {
importer->addIPServiceToObjectGroup();
*dbg << " GROUP MEMBER " << LT(0)->getText() << " ";
#line 2510 "PIXCfgParser.cpp"
#line 2559 "PIXCfgParser.cpp"
}
break;
}
@ -2537,7 +2586,7 @@ void PIXCfgParser::service_object() {
importer->protocol = LT(0)->getText();
*dbg << " SERVICE TCP/UDP" << LT(0)->getText() << " ";
#line 2541 "PIXCfgParser.cpp"
#line 2590 "PIXCfgParser.cpp"
}
{
switch ( LA(1)) {
@ -2629,7 +2678,7 @@ void PIXCfgParser::service_object() {
importer->addTCPUDPServiceToObjectGroup();
#line 2633 "PIXCfgParser.cpp"
#line 2682 "PIXCfgParser.cpp"
}
break;
}
@ -2647,7 +2696,7 @@ void PIXCfgParser::service_object() {
importer->icmp_type = LT(0)->getText();
#line 2651 "PIXCfgParser.cpp"
#line 2700 "PIXCfgParser.cpp"
}
break;
}
@ -2660,7 +2709,7 @@ void PIXCfgParser::service_object() {
importer->icmp_spec = icmp_word->getText();
#line 2664 "PIXCfgParser.cpp"
#line 2713 "PIXCfgParser.cpp"
}
break;
}
@ -2676,7 +2725,7 @@ void PIXCfgParser::service_object() {
importer->addICMPServiceToObjectGroup();
*dbg << " SERVICE ICMP " << LT(0)->getText() << " ";
#line 2680 "PIXCfgParser.cpp"
#line 2729 "PIXCfgParser.cpp"
}
break;
}
@ -2691,7 +2740,7 @@ void PIXCfgParser::service_object() {
importer->addNamedObjectToObjectGroup(name->getText());
*dbg << " GROUP MEMBER " << name->getLine() << std::endl;
#line 2695 "PIXCfgParser.cpp"
#line 2744 "PIXCfgParser.cpp"
}
break;
}
@ -2713,6 +2762,7 @@ void PIXCfgParser::service_object() {
}
void PIXCfgParser::permit_ext() {
Tracer traceInOut(this, "permit_ext");
try { // for error handling
match(PERMIT);
@ -2724,7 +2774,7 @@ void PIXCfgParser::permit_ext() {
importer->action = "permit";
*dbg << LT(1)->getLine() << ":" << " permit ";
#line 2728 "PIXCfgParser.cpp"
#line 2778 "PIXCfgParser.cpp"
}
rule_ext();
match(NEWLINE);
@ -2733,7 +2783,7 @@ void PIXCfgParser::permit_ext() {
importer->pushRule();
#line 2737 "PIXCfgParser.cpp"
#line 2787 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -2747,6 +2797,7 @@ void PIXCfgParser::permit_ext() {
}
void PIXCfgParser::deny_ext() {
Tracer traceInOut(this, "deny_ext");
try { // for error handling
match(DENY);
@ -2758,7 +2809,7 @@ void PIXCfgParser::deny_ext() {
importer->action = "deny";
*dbg << LT(1)->getLine() << ":" << " deny ";
#line 2762 "PIXCfgParser.cpp"
#line 2813 "PIXCfgParser.cpp"
}
rule_ext();
match(NEWLINE);
@ -2767,7 +2818,7 @@ void PIXCfgParser::deny_ext() {
importer->pushRule();
#line 2771 "PIXCfgParser.cpp"
#line 2822 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -2781,6 +2832,7 @@ void PIXCfgParser::deny_ext() {
}
void PIXCfgParser::remark() {
Tracer traceInOut(this, "remark");
try { // for error handling
match(REMARK);
@ -2799,7 +2851,7 @@ void PIXCfgParser::remark() {
*dbg << " REMARK " << rem << std::endl;
//consumeUntil(NEWLINE);
#line 2803 "PIXCfgParser.cpp"
#line 2855 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -2813,6 +2865,7 @@ void PIXCfgParser::remark() {
}
void PIXCfgParser::rule_ext() {
Tracer traceInOut(this, "rule_ext");
try { // for error handling
{
@ -2838,13 +2891,13 @@ void PIXCfgParser::rule_ext() {
if ( inputState->guessing==0 ) {
#line 825 "pix.g"
importer->SaveTmpAddrToSrc(); *dbg << "(src) ";
#line 2842 "PIXCfgParser.cpp"
#line 2895 "PIXCfgParser.cpp"
}
hostaddr_ext();
if ( inputState->guessing==0 ) {
#line 826 "pix.g"
importer->SaveTmpAddrToDst(); *dbg << "(dst) ";
#line 2848 "PIXCfgParser.cpp"
#line 2901 "PIXCfgParser.cpp"
}
{
switch ( LA(1)) {
@ -2914,19 +2967,19 @@ void PIXCfgParser::rule_ext() {
importer->protocol = LT(0)->getText();
*dbg << "protocol " << LT(0)->getText() << " ";
#line 2918 "PIXCfgParser.cpp"
#line 2971 "PIXCfgParser.cpp"
}
hostaddr_ext();
if ( inputState->guessing==0 ) {
#line 836 "pix.g"
importer->SaveTmpAddrToSrc(); *dbg << "(src) ";
#line 2924 "PIXCfgParser.cpp"
#line 2977 "PIXCfgParser.cpp"
}
hostaddr_ext();
if ( inputState->guessing==0 ) {
#line 837 "pix.g"
importer->SaveTmpAddrToDst(); *dbg << "(dst) ";
#line 2930 "PIXCfgParser.cpp"
#line 2983 "PIXCfgParser.cpp"
}
{
switch ( LA(1)) {
@ -3036,13 +3089,13 @@ void PIXCfgParser::rule_ext() {
importer->protocol = LT(0)->getText();
*dbg << "protocol " << LT(0)->getText() << " ";
#line 3040 "PIXCfgParser.cpp"
#line 3093 "PIXCfgParser.cpp"
}
hostaddr_ext();
if ( inputState->guessing==0 ) {
#line 848 "pix.g"
importer->SaveTmpAddrToSrc(); *dbg << "(src) ";
#line 3046 "PIXCfgParser.cpp"
#line 3099 "PIXCfgParser.cpp"
}
{
switch ( LA(1)) {
@ -3056,7 +3109,7 @@ void PIXCfgParser::rule_ext() {
if ( inputState->guessing==0 ) {
#line 849 "pix.g"
importer->SaveTmpPortToSrc();
#line 3060 "PIXCfgParser.cpp"
#line 3113 "PIXCfgParser.cpp"
}
break;
}
@ -3076,7 +3129,7 @@ void PIXCfgParser::rule_ext() {
if ( inputState->guessing==0 ) {
#line 850 "pix.g"
importer->SaveTmpAddrToDst(); *dbg << "(dst) ";
#line 3080 "PIXCfgParser.cpp"
#line 3133 "PIXCfgParser.cpp"
}
{
switch ( LA(1)) {
@ -3090,7 +3143,7 @@ void PIXCfgParser::rule_ext() {
if ( inputState->guessing==0 ) {
#line 851 "pix.g"
importer->SaveTmpPortToDst();
#line 3094 "PIXCfgParser.cpp"
#line 3147 "PIXCfgParser.cpp"
}
break;
}
@ -3200,7 +3253,7 @@ void PIXCfgParser::rule_ext() {
*dbg << std::endl;
#line 3204 "PIXCfgParser.cpp"
#line 3257 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -3214,6 +3267,7 @@ void PIXCfgParser::rule_ext() {
}
void PIXCfgParser::ip_protocols() {
Tracer traceInOut(this, "ip_protocols");
try { // for error handling
ip_protocol_names();
@ -3223,7 +3277,7 @@ void PIXCfgParser::ip_protocols() {
importer->protocol = LT(0)->getText();
*dbg << "protocol " << LT(0)->getText() << " ";
#line 3227 "PIXCfgParser.cpp"
#line 3281 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -3237,6 +3291,7 @@ void PIXCfgParser::ip_protocols() {
}
void PIXCfgParser::hostaddr_ext() {
Tracer traceInOut(this, "hostaddr_ext");
ANTLR_USE_NAMESPACE(antlr)RefToken h = ANTLR_USE_NAMESPACE(antlr)nullToken;
ANTLR_USE_NAMESPACE(antlr)RefToken a = ANTLR_USE_NAMESPACE(antlr)nullToken;
ANTLR_USE_NAMESPACE(antlr)RefToken m = ANTLR_USE_NAMESPACE(antlr)nullToken;
@ -3257,7 +3312,7 @@ void PIXCfgParser::hostaddr_ext() {
importer->tmp_nm = "255.255.255.255";
*dbg << h->getText() << "/255.255.255.255";
#line 3261 "PIXCfgParser.cpp"
#line 3316 "PIXCfgParser.cpp"
}
break;
}
@ -3276,7 +3331,7 @@ void PIXCfgParser::hostaddr_ext() {
importer->tmp_nm = m->getText();
*dbg << a->getText() << "/" << m->getText();
#line 3280 "PIXCfgParser.cpp"
#line 3335 "PIXCfgParser.cpp"
}
break;
}
@ -3290,7 +3345,7 @@ void PIXCfgParser::hostaddr_ext() {
importer->tmp_nm = "0.0.0.0";
*dbg << "0.0.0.0/0.0.0.0";
#line 3294 "PIXCfgParser.cpp"
#line 3349 "PIXCfgParser.cpp"
}
break;
}
@ -3311,6 +3366,7 @@ void PIXCfgParser::hostaddr_ext() {
}
void PIXCfgParser::time_range() {
Tracer traceInOut(this, "time_range");
ANTLR_USE_NAMESPACE(antlr)RefToken tr_name = ANTLR_USE_NAMESPACE(antlr)nullToken;
try { // for error handling
@ -3323,7 +3379,7 @@ void PIXCfgParser::time_range() {
importer->time_range_name = tr_name->getText();
*dbg << "time_range " << tr_name->getText() << " ";
#line 3327 "PIXCfgParser.cpp"
#line 3383 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -3337,6 +3393,7 @@ void PIXCfgParser::time_range() {
}
void PIXCfgParser::fragments() {
Tracer traceInOut(this, "fragments");
try { // for error handling
match(FRAGMENTS);
@ -3346,7 +3403,7 @@ void PIXCfgParser::fragments() {
importer->fragments = true;
*dbg << "fragments ";
#line 3350 "PIXCfgParser.cpp"
#line 3407 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -3360,6 +3417,7 @@ void PIXCfgParser::fragments() {
}
void PIXCfgParser::log() {
Tracer traceInOut(this, "log");
try { // for error handling
{
@ -3386,7 +3444,7 @@ void PIXCfgParser::log() {
importer->logging = true;
*dbg << "logging ";
#line 3390 "PIXCfgParser.cpp"
#line 3448 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -3400,6 +3458,7 @@ void PIXCfgParser::log() {
}
void PIXCfgParser::icmp_spec() {
Tracer traceInOut(this, "icmp_spec");
ANTLR_USE_NAMESPACE(antlr)RefToken icmp_type = ANTLR_USE_NAMESPACE(antlr)nullToken;
ANTLR_USE_NAMESPACE(antlr)RefToken icmp_code = ANTLR_USE_NAMESPACE(antlr)nullToken;
ANTLR_USE_NAMESPACE(antlr)RefToken icmp_word = ANTLR_USE_NAMESPACE(antlr)nullToken;
@ -3424,7 +3483,7 @@ void PIXCfgParser::icmp_spec() {
*dbg << icmp_type->getText() << " "
<< icmp_code->getText() << " ";
#line 3428 "PIXCfgParser.cpp"
#line 3487 "PIXCfgParser.cpp"
}
break;
}
@ -3438,7 +3497,7 @@ void PIXCfgParser::icmp_spec() {
importer->icmp_spec = icmp_word->getText();
*dbg << icmp_word->getText() << " ";
#line 3442 "PIXCfgParser.cpp"
#line 3501 "PIXCfgParser.cpp"
}
break;
}
@ -3460,6 +3519,7 @@ void PIXCfgParser::icmp_spec() {
}
void PIXCfgParser::established() {
Tracer traceInOut(this, "established");
try { // for error handling
match(ESTABLISHED);
@ -3469,7 +3529,7 @@ void PIXCfgParser::established() {
importer->established = true;
*dbg << "established ";
#line 3473 "PIXCfgParser.cpp"
#line 3533 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -3483,6 +3543,7 @@ void PIXCfgParser::established() {
}
void PIXCfgParser::single_port_op() {
Tracer traceInOut(this, "single_port_op");
try { // for error handling
{
@ -3519,7 +3580,7 @@ void PIXCfgParser::single_port_op() {
importer->tmp_port_op = LT(0)->getText();
*dbg << LT(0)->getText() << " ";
#line 3523 "PIXCfgParser.cpp"
#line 3584 "PIXCfgParser.cpp"
}
port_spec();
}
@ -3534,6 +3595,7 @@ void PIXCfgParser::single_port_op() {
}
void PIXCfgParser::port_range() {
Tracer traceInOut(this, "port_range");
try { // for error handling
match(RANGE);
@ -3544,7 +3606,7 @@ void PIXCfgParser::port_range() {
importer->tmp_port_op = "range";
*dbg << "range ";
#line 3548 "PIXCfgParser.cpp"
#line 3610 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -3558,6 +3620,7 @@ void PIXCfgParser::port_range() {
}
void PIXCfgParser::port_spec() {
Tracer traceInOut(this, "port_spec");
try { // for error handling
{
@ -3584,7 +3647,7 @@ void PIXCfgParser::port_spec() {
importer->tmp_port_spec = (std::string(" ") + LT(0)->getText());
*dbg << LT(0)->getText() << " " << importer->tmp_port_spec;
#line 3588 "PIXCfgParser.cpp"
#line 3651 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -3598,6 +3661,7 @@ void PIXCfgParser::port_spec() {
}
void PIXCfgParser::pair_of_ports_spec() {
Tracer traceInOut(this, "pair_of_ports_spec");
ANTLR_USE_NAMESPACE(antlr)RefToken s1 = ANTLR_USE_NAMESPACE(antlr)nullToken;
ANTLR_USE_NAMESPACE(antlr)RefToken s2 = ANTLR_USE_NAMESPACE(antlr)nullToken;
ANTLR_USE_NAMESPACE(antlr)RefToken e1 = ANTLR_USE_NAMESPACE(antlr)nullToken;
@ -3655,7 +3719,7 @@ void PIXCfgParser::pair_of_ports_spec() {
if (e2) importer->tmp_port_spec += e2->getText();
*dbg << "pair of ports: " << importer->tmp_port_spec;
#line 3659 "PIXCfgParser.cpp"
#line 3723 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -3669,6 +3733,7 @@ void PIXCfgParser::pair_of_ports_spec() {
}
void PIXCfgParser::hostaddr_std() {
Tracer traceInOut(this, "hostaddr_std");
ANTLR_USE_NAMESPACE(antlr)RefToken h = ANTLR_USE_NAMESPACE(antlr)nullToken;
ANTLR_USE_NAMESPACE(antlr)RefToken a = ANTLR_USE_NAMESPACE(antlr)nullToken;
ANTLR_USE_NAMESPACE(antlr)RefToken m = ANTLR_USE_NAMESPACE(antlr)nullToken;
@ -3686,7 +3751,7 @@ void PIXCfgParser::hostaddr_std() {
importer->tmp_nm = "0.0.0.0";
*dbg << h->getText() << "/0.0.0.0";
#line 3690 "PIXCfgParser.cpp"
#line 3755 "PIXCfgParser.cpp"
}
}
else if ((LA(1) == IPV4) && (LA(2) == IPV4)) {
@ -3703,7 +3768,7 @@ void PIXCfgParser::hostaddr_std() {
importer->tmp_nm = m->getText();
*dbg << a->getText() << "/" << m->getText();
#line 3707 "PIXCfgParser.cpp"
#line 3772 "PIXCfgParser.cpp"
}
}
else if ((LA(1) == ANY)) {
@ -3715,7 +3780,7 @@ void PIXCfgParser::hostaddr_std() {
importer->tmp_nm = "0.0.0.0";
*dbg << "0.0.0.0/0.0.0.0";
#line 3719 "PIXCfgParser.cpp"
#line 3784 "PIXCfgParser.cpp"
}
}
else {
@ -3734,6 +3799,7 @@ void PIXCfgParser::hostaddr_std() {
}
void PIXCfgParser::interface_description() {
Tracer traceInOut(this, "interface_description");
try { // for error handling
match(DESCRIPTION);
@ -3751,7 +3817,7 @@ void PIXCfgParser::interface_description() {
*dbg << " DESCRIPTION " << descr << std::endl;
//consumeUntil(NEWLINE);
#line 3755 "PIXCfgParser.cpp"
#line 3821 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -3765,6 +3831,7 @@ void PIXCfgParser::interface_description() {
}
void PIXCfgParser::interface_parameters() {
Tracer traceInOut(this, "interface_parameters");
try { // for error handling
match(NEWLINE);
@ -3773,7 +3840,7 @@ void PIXCfgParser::interface_parameters() {
importer->setCurrentLineNumber(LT(0)->getLine());
#line 3777 "PIXCfgParser.cpp"
#line 3844 "PIXCfgParser.cpp"
}
{
switch ( LA(1)) {
@ -3853,6 +3920,7 @@ void PIXCfgParser::interface_parameters() {
}
void PIXCfgParser::intf_address() {
Tracer traceInOut(this, "intf_address");
try { // for error handling
match(IP);
@ -3888,6 +3956,7 @@ void PIXCfgParser::intf_address() {
}
void PIXCfgParser::vlan_interface() {
Tracer traceInOut(this, "vlan_interface");
ANTLR_USE_NAMESPACE(antlr)RefToken vlan_id = ANTLR_USE_NAMESPACE(antlr)nullToken;
try { // for error handling
@ -3900,7 +3969,7 @@ void PIXCfgParser::vlan_interface() {
importer->setInterfaceVlanId(vlan_id->getText());
*dbg << " VLAN: " << vlan_id->getText() << std::endl;
#line 3904 "PIXCfgParser.cpp"
#line 3973 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -3914,6 +3983,7 @@ void PIXCfgParser::vlan_interface() {
}
void PIXCfgParser::sec_level() {
Tracer traceInOut(this, "sec_level");
ANTLR_USE_NAMESPACE(antlr)RefToken sec_level = ANTLR_USE_NAMESPACE(antlr)nullToken;
try { // for error handling
@ -3926,7 +3996,7 @@ void PIXCfgParser::sec_level() {
importer->setInterfaceSecurityLevel(sec_level->getText());
*dbg << "SEC_LEVEL: " << sec_level->getText() << std::endl;
#line 3930 "PIXCfgParser.cpp"
#line 4000 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -3940,6 +4010,7 @@ void PIXCfgParser::sec_level() {
}
void PIXCfgParser::nameif() {
Tracer traceInOut(this, "nameif");
ANTLR_USE_NAMESPACE(antlr)RefToken p_intf = ANTLR_USE_NAMESPACE(antlr)nullToken;
ANTLR_USE_NAMESPACE(antlr)RefToken intf_label = ANTLR_USE_NAMESPACE(antlr)nullToken;
ANTLR_USE_NAMESPACE(antlr)RefToken sec_level = ANTLR_USE_NAMESPACE(antlr)nullToken;
@ -3979,7 +4050,7 @@ void PIXCfgParser::nameif() {
*dbg << " NAMEIF: "
<< p_intf->getText() << label << seclevel << std::endl;
#line 3983 "PIXCfgParser.cpp"
#line 4054 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -3993,6 +4064,7 @@ void PIXCfgParser::nameif() {
}
void PIXCfgParser::switchport() {
Tracer traceInOut(this, "switchport");
ANTLR_USE_NAMESPACE(antlr)RefToken vlan_num = ANTLR_USE_NAMESPACE(antlr)nullToken;
try { // for error handling
@ -4007,7 +4079,7 @@ void PIXCfgParser::switchport() {
importer->addMessageToLog("Switch port vlan " + vlan_num->getText());
*dbg << "Switch port vlan " << vlan_num->getText() << std::endl;
#line 4011 "PIXCfgParser.cpp"
#line 4083 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -4021,6 +4093,7 @@ void PIXCfgParser::switchport() {
}
void PIXCfgParser::shutdown() {
Tracer traceInOut(this, "shutdown");
try { // for error handling
match(SHUTDOWN);
@ -4031,7 +4104,7 @@ void PIXCfgParser::shutdown() {
*dbg<< LT(1)->getLine() << ":"
<< " INTERFACE SHUTDOWN " << std::endl;
#line 4035 "PIXCfgParser.cpp"
#line 4108 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -4045,6 +4118,7 @@ void PIXCfgParser::shutdown() {
}
void PIXCfgParser::interface_no_commands() {
Tracer traceInOut(this, "interface_no_commands");
try { // for error handling
match(NO);
@ -4056,7 +4130,7 @@ void PIXCfgParser::interface_no_commands() {
<< LT(0)->getText() << std::endl;
consumeUntil(NEWLINE);
#line 4060 "PIXCfgParser.cpp"
#line 4134 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -4070,6 +4144,7 @@ void PIXCfgParser::interface_no_commands() {
}
void PIXCfgParser::unsupported_interface_commands() {
Tracer traceInOut(this, "unsupported_interface_commands");
try { // for error handling
{
@ -4157,7 +4232,7 @@ void PIXCfgParser::unsupported_interface_commands() {
<< LT(0)->getText() << std::endl;
consumeUntil(NEWLINE);
#line 4161 "PIXCfgParser.cpp"
#line 4236 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -4171,6 +4246,7 @@ void PIXCfgParser::unsupported_interface_commands() {
}
void PIXCfgParser::v6_ip_address() {
Tracer traceInOut(this, "v6_ip_address");
try { // for error handling
if ((LA(1) == WORD) && (LA(2) == DHCP)) {
@ -4195,6 +4271,7 @@ void PIXCfgParser::v6_ip_address() {
}
void PIXCfgParser::v7_ip_address() {
Tracer traceInOut(this, "v7_ip_address");
try { // for error handling
switch ( LA(1)) {
@ -4225,6 +4302,7 @@ void PIXCfgParser::v7_ip_address() {
}
void PIXCfgParser::v6_dhcp_address() {
Tracer traceInOut(this, "v6_dhcp_address");
ANTLR_USE_NAMESPACE(antlr)RefToken lbl = ANTLR_USE_NAMESPACE(antlr)nullToken;
ANTLR_USE_NAMESPACE(antlr)RefToken dhcp = ANTLR_USE_NAMESPACE(antlr)nullToken;
@ -4245,7 +4323,7 @@ void PIXCfgParser::v6_dhcp_address() {
// which we do not support
consumeUntil(NEWLINE);
#line 4249 "PIXCfgParser.cpp"
#line 4327 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -4259,6 +4337,7 @@ void PIXCfgParser::v6_dhcp_address() {
}
void PIXCfgParser::v6_static_address() {
Tracer traceInOut(this, "v6_static_address");
ANTLR_USE_NAMESPACE(antlr)RefToken lbl = ANTLR_USE_NAMESPACE(antlr)nullToken;
ANTLR_USE_NAMESPACE(antlr)RefToken a = ANTLR_USE_NAMESPACE(antlr)nullToken;
ANTLR_USE_NAMESPACE(antlr)RefToken m = ANTLR_USE_NAMESPACE(antlr)nullToken;
@ -4282,7 +4361,7 @@ void PIXCfgParser::v6_static_address() {
// in case there are some other parameters after address and netmask
consumeUntil(NEWLINE);
#line 4286 "PIXCfgParser.cpp"
#line 4365 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -4296,6 +4375,7 @@ void PIXCfgParser::v6_static_address() {
}
void PIXCfgParser::v7_dhcp_address() {
Tracer traceInOut(this, "v7_dhcp_address");
ANTLR_USE_NAMESPACE(antlr)RefToken dhcp = ANTLR_USE_NAMESPACE(antlr)nullToken;
try { // for error handling
@ -4310,7 +4390,7 @@ void PIXCfgParser::v7_dhcp_address() {
<< " INTRFACE ADDRESS: " << addr << std::endl;
consumeUntil(NEWLINE);
#line 4314 "PIXCfgParser.cpp"
#line 4394 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -4324,6 +4404,7 @@ void PIXCfgParser::v7_dhcp_address() {
}
void PIXCfgParser::v7_static_address() {
Tracer traceInOut(this, "v7_static_address");
ANTLR_USE_NAMESPACE(antlr)RefToken a = ANTLR_USE_NAMESPACE(antlr)nullToken;
ANTLR_USE_NAMESPACE(antlr)RefToken m = ANTLR_USE_NAMESPACE(antlr)nullToken;
ANTLR_USE_NAMESPACE(antlr)RefToken s = ANTLR_USE_NAMESPACE(antlr)nullToken;
@ -4369,7 +4450,7 @@ void PIXCfgParser::v7_static_address() {
}
consumeUntil(NEWLINE);
#line 4373 "PIXCfgParser.cpp"
#line 4454 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -4383,6 +4464,7 @@ void PIXCfgParser::v7_static_address() {
}
void PIXCfgParser::access_group_by_name() {
Tracer traceInOut(this, "access_group_by_name");
ANTLR_USE_NAMESPACE(antlr)RefToken acln = ANTLR_USE_NAMESPACE(antlr)nullToken;
ANTLR_USE_NAMESPACE(antlr)RefToken dir = ANTLR_USE_NAMESPACE(antlr)nullToken;
ANTLR_USE_NAMESPACE(antlr)RefToken intf_label = ANTLR_USE_NAMESPACE(antlr)nullToken;
@ -4409,7 +4491,7 @@ void PIXCfgParser::access_group_by_name() {
<< " " << intf_label->getText()
<< " " << dir->getText() << std::endl;
#line 4413 "PIXCfgParser.cpp"
#line 4495 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {

4
src/unit_tests/ImporterTest/test_data/asa8.3.test
View File

@ -184,7 +184,7 @@ object service udp-src-2
object service udp-src-3
service udp source eq 80
object service udp-src-4
service udp source neq 80
service udp source neq 88
object service udp-src-5
service udp source range 1000 1010
!
@ -195,7 +195,7 @@ object service udp-dst-2
object service udp-dst-3
service udp destination eq 80
object service udp-dst-4
service udp destination neq 80
service udp destination neq 88
object service udp-dst-5
service udp destination range 1001 1011
!