onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-05-02 15:17:28 +02:00
Code Issues Releases Wiki Activity

see #2222 refactored importer into separate module/lib

Browse Source
This commit is contained in:
Vadim Kurland 2011-03-15 17:38:41 -07:00
parent 3339e882ee
commit 8485797e41
34 changed files with 221 additions and 227 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="3500"
BUILD_NUM="3501"
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.3500"
#define VERSION "4.2.0.3501"
#define GENERATION "4.2"

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

@ -3,7 +3,7 @@
%define name fwbuilder
%define version 4.2.0.3500
%define version 4.2.0.3501
%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.3500-1
Version: 4.2.0.3501-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.3500
%define version 4.2.0.3501
%define release 1
%if "%_vendor" == "MandrakeSoft"

12
src/gui/gui.pro
View File

@ -12,19 +12,21 @@ SOURCES += main.cpp
# Arrange static libraries before dynamic ones in the linker command
# line. libgui goes first
win32 {
IMPORT_LIB = ../import/release/import.lib
FWBPARSER_LIB = ../parsers/release/fwbparser.lib
FWTRANSFER_LIB = ../fwtransfer/release/fwtransfer.lib
STATIC_LIBS += ../libgui/release/gui.lib
}
!win32 {
IMPORT_LIB = ../import/libimport.a
FWBPARSER_LIB = ../parsers/libfwbparser.a
FWTRANSFER_LIB = ../fwtransfer/libfwtransfer.a
STATIC_LIBS += ../libgui/libgui.a
}
INCLUDEPATH += $$ANTLR_INCLUDEPATH
STATIC_LIBS += $$FWBPARSER_LIB $$ANTLR_LIBS
STATIC_LIBS += $$IMPORT_LIB $$FWBPARSER_LIB $$ANTLR_LIBS
DEFINES += $$ANTLR_DEFINES
# fwtransfer lib. Add this before adding -lQtDBus to LIBS below
@ -39,6 +41,7 @@ contains( HAVE_QTDBUS, 1 ):unix {
# !macx:STATIC_LIBS += -lQtDBus # workaround for QT += dbus not working with Qt < 4.4.0
INCLUDEPATH += \
../common \
../import \
../iptlib \
../pflib \
../cisco_lib/ \
@ -51,6 +54,7 @@ win32:INCLUDEPATH += ../libgui/ui
DEPENDPATH = \
../common \
../import \
../iptlib \
../pflib \
../cisco_lib/ \
@ -86,7 +90,8 @@ win32:PRE_TARGETDEPS = \
../compiler_lib/release/compilerdriver.lib \
../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \
../libfwbuilder/src/fwcompiler/release/fwcompiler.lib \
$$FWBPARSER_LIB
$$FWBPARSER_LIB \
$$IMPORT_LIB
!win32:PRE_TARGETDEPS = \
../libgui/libgui.a \
@ -97,7 +102,8 @@ win32:PRE_TARGETDEPS = \
../compiler_lib/libcompilerdriver.a \
../libfwbuilder/src/fwbuilder/libfwbuilder.a \
../libfwbuilder/src/fwcompiler/libfwcompiler.a \
$$FWBPARSER_LIB
$$FWBPARSER_LIB \
$$IMPORT_LIB
macx:STATIC_LIBS += -framework \
Carbon

20
src/libgui/IOSImporter.cpp → src/import/IOSImporter.cpp
View File

@ -22,9 +22,10 @@
*/
#include "../../config.h"
#include "global.h"
#include "utils_no_qt.h"
#include "platforms.h"
// #include "global.h"
// #include "utils_no_qt.h"
// #include "platforms.h"
#include "IOSImporter.h"
@ -46,8 +47,12 @@
#include "fwbuilder/Policy.h"
#include "fwbuilder/RuleElement.h"
#include <QString>
#include <QtDebug>
extern int fwbdebug;
using namespace std;
using namespace libfwbuilder;
@ -135,7 +140,8 @@ FWObject* IOSImporter::createAddress(const std::string &addr,
FWObject* IOSImporter::createICMPService()
{
std::string icmpspec = strip(icmp_spec);
// TODO: convert icmp_spec to QString and cisco_icmp_specs to QMap
std::string icmpspec = QString(icmp_spec.c_str()).trimmed().toStdString();
if (!icmpspec.empty())
{
// Cisco is trying to be too helpful, they translate many
@ -193,8 +199,10 @@ std::pair<int,int> IOSImporter::convertPortSpec(const std::string &port_op,
int range_start;
int range_end;
std::string s1,s2;
std::string portop = strip(port_op);
std::string portspec = strip(port_spec);
// TODO: convert port_op and port_spec to QString
std::string portop = QString(port_op.c_str()).trimmed().toStdString();
std::string portspec = QString(port_spec.c_str()).trimmed().toStdString();
if (fwbdebug)
qDebug() << QString("Convert TCP/UDP port spec: port_op=%1 port_spec=%2").

0
src/libgui/IOSImporter.h → src/import/IOSImporter.h
View File

5
src/libgui/IOSImporterRun.cpp → src/import/IOSImporterRun.cpp
View File

@ -24,7 +24,8 @@
*/
#include "../../config.h"
#include "global.h"
// #include "global.h"
#include "IOSImporter.h"
@ -41,6 +42,8 @@
#include "../parsers/IOSCfgLexer.hpp"
#include "../parsers/IOSCfgParser.hpp"
extern int fwbdebug;
/*
* Only this module depends on IOSCfgLexer and IOSCfgParser,
* so only this file is recompiled when we change grammar

27
src/libgui/IPTImporter.cpp → src/import/IPTImporter.cpp
View File

@ -22,10 +22,10 @@
*/
#include "../../config.h"
#include "global.h"
#include "utils_no_qt.h"
#include "platforms.h"
// #include "global.h"
// #include "utils_no_qt.h"
// #include "platforms.h"
#include "IPTImporter.h"
#include "getProtoByName.h"
@ -56,10 +56,12 @@
#include <QString>
#include <QtDebug>
extern int fwbdebug;
using namespace std;
using namespace libfwbuilder;
IPTImporter::IPTImporter(FWObject *lib,
std::istringstream &input,
Logger *log,
@ -225,14 +227,15 @@ void IPTImporter::pushTmpPortSpecToBothPortList()
FWObject* IPTImporter::createICMPService()
{
std::string icmpspec = strip(icmp_spec);
if (!icmpspec.empty())
// TODO: convert icmp_spec to QString
QString icmpspec = QString(icmp_spec.c_str()).trimmed();
if ( ! icmpspec.isEmpty())
{
// Cisco is trying to be too helpful, they translate many
// icmp type/code combinations into stings
if (icmp_specs.count(icmpspec)!=0)
if (icmp_specs.count(icmpspec.toStdString())!=0)
{
std::pair<int,int> pp = icmp_specs[icmpspec];
std::pair<int,int> pp = icmp_specs[icmpspec.toStdString()];
std::ostringstream s1, s2;
s1 << pp.first;
icmp_type = s1.str();
@ -240,8 +243,8 @@ FWObject* IPTImporter::createICMPService()
icmp_code = s2.str();
} else
{
reportError(
std::string("Import of icmp protocol '") + icmp_spec + "' failed");
QString err("Import of icmp protocol %1 failed");
reportError(err.arg(icmpspec));
icmp_code = "-1";
icmp_type = "-1";
}
@ -292,7 +295,7 @@ int IPTImporter::convertPort(const std::string &port_spec,
int port = GetServByName::getPortByName(ps, proto);
if (port == -1)
{
reportError(std::string("Port spec '") + port_spec + "' unknown ");
reportError(QString("Port spec %1 is unknown").arg(ps));
port = 0;
}
return port;
@ -513,7 +516,7 @@ void IPTImporter::processModuleMatches()
"protocols with two or more module matches, such as \n"
"module 'mark', 'recent' or 'length'. Use additional \n"
"branches to implement this complex match.");
reportError(err.toUtf8().constData());
reportError(err);
break;
}
@ -583,7 +586,7 @@ void IPTImporter::addLimitMatch(PolicyRule *rule)
assert(ropt!=NULL);
if (target!="LOG" && !limit_val.empty())
{
/* TODO: this is where we should add support for hashlimit */
// TODO: this is where we should add support for hashlimit
ropt->setStr("limit_value", limit_val);
ropt->setStr("limit_suffix", std::string("/") + limit_suffix);
if (!limit_burst.empty())

0
src/libgui/IPTImporter.h → src/import/IPTImporter.h
View File

3
src/libgui/IPTImporterRun.cpp → src/import/IPTImporterRun.cpp
View File

@ -24,7 +24,6 @@
*/
#include "../../config.h"
#include "global.h"
#include "IPTImporter.h"
@ -41,6 +40,8 @@
#include "../parsers/IPTCfgLexer.hpp"
#include "../parsers/IPTCfgParser.hpp"
extern int fwbdebug;
using namespace std;
/*

60
src/libgui/Importer.cpp → src/import/Importer.cpp
View File

@ -21,11 +21,12 @@
*/
#include "../../config.h"
#include "global.h"
#include "utils_no_qt.h"
#include "platforms.h"
/*
* Trying to avoid dependency on libgui (except for FWBTree, which
* will be refactored into some other common module in the future).
*/
#include "../../config.h"
#include "Importer.h"
@ -51,14 +52,14 @@
#include "fwbuilder/NAT.h"
#include "fwbuilder/RuleElement.h"
#include "FWWindow.h"
#include "ProjectPanel.h"
#include "FWBTree.h"
#include "../libgui/FWBTree.h"
#include <QString>
#include <QtDebug>
extern int fwbdebug;
using namespace libfwbuilder;
using namespace std;
@ -888,39 +889,40 @@ FWObject* Importer::getTagService(const std::string &tagcode)
FWObject* Importer::createICMPService()
{
int type, code;
std::istringstream s1(icmp_type), s2(icmp_code);
s1.exceptions(std::ios::failbit);
s2.exceptions(std::ios::failbit);
if (strip(icmp_type).empty()) type = -1;
// TODO: convert icmp_type and icmp_code to QString
QString icmp_type_qs = QString(icmp_type.c_str()).trimmed();
QString icmp_code_qs = QString(icmp_code.c_str()).trimmed();
if (icmp_type_qs.isEmpty()) type = -1;
else
{
try
{
s1 >> type;
} catch (std::exception& e)
bool ok = false;
type = icmp_type_qs.toInt(&ok);
if (!ok)
{
// could not convert
type = -1;
reportError(std::string("ICMP type '") + icmp_type + "' unknown");
QString err("ICMP type %1 is unknown");
reportError(err.arg(icmp_type_qs));
}
}
if (strip(icmp_code).empty()) code = -1;
if (icmp_code_qs.isEmpty()) code = -1;
else
{
try
{
s2 >> code;
} catch (std::exception& e)
bool ok = false;
type = icmp_code_qs.toInt(&ok);
if (!ok)
{
// could not convert
code = -1;
reportError(std::string("ICMP code '") + icmp_code + "' unknown");
type = -1;
QString err("ICMP code %1 is unknown");
reportError(err.arg(icmp_code_qs));
}
}
return getICMPService(type,code);
return getICMPService(type, code);
}
FWObject* Importer::createIPService()
@ -1159,13 +1161,17 @@ void Importer::markCurrentRuleBad(const std::string &comment)
}
void Importer::reportError(const std::string &comment)
{
reportError(QString::fromUtf8(comment.c_str()));
}
void Importer::reportError(const QString &comment)
{
error_counter++;
QString err = QObject::tr("Parser error: Line %1: %2\n")
.arg(getCurrentLineNumber())
.arg(QString::fromUtf8(comment.c_str()));
.arg(getCurrentLineNumber()).arg(comment);
*logger << err.toUtf8().constData();
if (current_rule != NULL) markCurrentRuleBad(comment);
if (current_rule != NULL) markCurrentRuleBad(comment.toUtf8().constData());
}
int Importer::countRules()

1
src/libgui/Importer.h → src/import/Importer.h
View File

@ -352,6 +352,7 @@ public:
void markCurrentRuleBad(const std::string &comment);
void reportError(const std::string &comment);
void reportError(const QString &comment);
// this method actually adds interfaces to the firewall object
// and does final clean up.

15
src/libgui/PIXImporter.cpp → src/import/PIXImporter.cpp
View File

@ -24,10 +24,6 @@
*/
#include "../../config.h"
#include "global.h"
#include "utils_no_qt.h"
#include "platforms.h"
#include "PIXImporter.h"
@ -50,12 +46,23 @@
#include "fwbuilder/Policy.h"
#include "fwbuilder/RuleElement.h"
#include <QString>
#include <QtDebug>
extern int fwbdebug;
// TODO: this should move to some common library, together with
// getVersionsForPlatform() it uses. Currently these functions are
// defined in libgui/platforms.cpp
extern QString findBestVersionMatch(const QString &platform,
const QString &discovered_version);
using namespace std;
using namespace libfwbuilder;
PIXImporter::PIXImporter(FWObject *lib,
std::istringstream &input,
Logger *log,

0
src/libgui/PIXImporter.h → src/import/PIXImporter.h
View File

4
src/libgui/PIXImporterRun.cpp → src/import/PIXImporterRun.cpp
View File

@ -24,7 +24,6 @@
*/
#include "../../config.h"
#include "global.h"
#include "PIXImporter.h"
@ -40,6 +39,9 @@
#include "../parsers/PIXCfgLexer.hpp"
#include "../parsers/PIXCfgParser.hpp"
extern int fwbdebug;
/*
* Only this module depends on PIXCfgLexer and PIXCfgParser,
* so only this file is recompiled when we change grammar

0
src/libgui/getProtoByName.cpp → src/import/getProtoByName.cpp
View File

0
src/libgui/getProtoByName.h → src/import/getProtoByName.h
View File

0
src/libgui/getServByName.cpp → src/import/getServByName.cpp
View File

0
src/libgui/getServByName.h → src/import/getServByName.h
View File

34
src/import/import.pro Normal file
View File

@ -0,0 +1,34 @@
#-*- mode: makefile; tab-width: 4; -*-
#
include(../../qmake.inc)
#
TEMPLATE = lib
#
SOURCES = getProtoByName.cpp \
getServByName.cpp \
Importer.cpp \
IOSImporter.cpp \
IOSImporterRun.cpp \
IPTImporter.cpp \
IPTImporterRun.cpp \
PIXImporter.cpp \
PIXImporterRun.cpp \
HEADERS = getProtoByName.h \
getServByName.h \
Importer.h \
IOSImporter.h \
IPTImporter.h \
PIXImporter.h \
CONFIG += staticlib
INCLUDEPATH += $$ANTLR_INCLUDEPATH ../compiler_lib ../parsers ../libfwbuilder/src/
LIBS += $$ANTLR_LIBS
DEFINES += $$ANTLR_DEFINES
TARGET = import
INSTALLS -= target

17
src/libgui/libgui.pro
View File

@ -30,12 +30,6 @@ HEADERS += ../../config.h \
TextEditWidget.h \
utils.h \
utils_no_qt.h \
getProtoByName.h \
getServByName.h \
Importer.h \
IOSImporter.h \
IPTImporter.h \
PIXImporter.h \
SSHSession.h \
SSHUnx.h \
SSHCisco.h \
@ -243,15 +237,6 @@ SOURCES += ProjectPanel.cpp \
ssh_wrappers.cpp \
utils.cpp \
utils_no_qt.cpp \
getProtoByName.cpp \
getServByName.cpp \
Importer.cpp \
IOSImporter.cpp \
IOSImporterRun.cpp \
IPTImporter.cpp \
IPTImporterRun.cpp \
PIXImporter.cpp \
PIXImporterRun.cpp \
SSHSession.cpp \
SSHUnx.cpp \
SSHCisco.cpp \
@ -588,6 +573,7 @@ DEFINES += $$ANTLR_DEFINES
# !macx:LIBS += -lQtDBus # workaround for QT += dbus not working with Qt < 4.4.0
INCLUDEPATH += ../common \
../import \
../iptlib \
../pflib \
../cisco_lib/ \
@ -595,6 +581,7 @@ INCLUDEPATH += ../common \
../libfwbuilder/src
DEPENDPATH = ../common \
../import \
../iptlib \
../pflib \
../cisco_lib/ \

2
src/parsers/IOSCfgLexer.cpp
View File

@ -21,7 +21,7 @@
#include <antlr/Token.hpp>
#include <antlr/TokenBuffer.hpp>
#include "../libgui/IOSImporter.h"
#include "IOSImporter.h"
#line 27 "IOSCfgLexer.cpp"
#line 1 "iosacl.g"

2
src/parsers/IOSCfgParser.cpp
View File

@ -16,7 +16,7 @@
#include <antlr/Token.hpp>
#include <antlr/TokenBuffer.hpp>
#include "../libgui/IOSImporter.h"
#include "IOSImporter.h"
#line 22 "IOSCfgParser.cpp"
#line 1 "iosacl.g"

2
src/parsers/IPTCfgLexer.cpp
View File

@ -21,7 +21,7 @@
#include <antlr/Token.hpp>
#include <antlr/TokenBuffer.hpp>
#include "../libgui/IPTImporter.h"
#include "IPTImporter.h"
#include "fwbuilder/TCPService.h"
#include "fwbuilder/Logger.h"

2
src/parsers/IPTCfgParser.cpp
View File

@ -16,7 +16,7 @@
#include <antlr/Token.hpp>
#include <antlr/TokenBuffer.hpp>
#include "../libgui/IPTImporter.h"
#include "IPTImporter.h"
#include "fwbuilder/TCPService.h"
#include "fwbuilder/Logger.h"

2
src/parsers/PIXCfgLexer.cpp
View File

@ -21,7 +21,7 @@
#include <antlr/Token.hpp>
#include <antlr/TokenBuffer.hpp>
#include "../libgui/PIXImporter.h"
#include "PIXImporter.h"
#line 27 "PIXCfgLexer.cpp"
#line 1 "pix.g"

219
src/parsers/PIXCfgParser.cpp
View File

@ -16,7 +16,7 @@
#include <antlr/Token.hpp>
#include <antlr/TokenBuffer.hpp>
#include "../libgui/PIXImporter.h"
#include "PIXImporter.h"
#line 22 "PIXCfgParser.cpp"
#line 1 "pix.g"
@ -47,7 +47,6 @@ PIXCfgParser::PIXCfgParser(const ANTLR_USE_NAMESPACE(antlr)ParserSharedInputStat
}
void PIXCfgParser::cfgfile() {
Tracer traceInOut(this, "cfgfile");
try { // for error handling
{ // ( ... )+
@ -183,7 +182,6 @@ void PIXCfgParser::cfgfile() {
}
void PIXCfgParser::comment() {
Tracer traceInOut(this, "comment");
try { // for error handling
{
@ -216,7 +214,6 @@ void PIXCfgParser::comment() {
}
void PIXCfgParser::version() {
Tracer traceInOut(this, "version");
try { // for error handling
{
@ -246,7 +243,7 @@ void PIXCfgParser::version() {
*dbg << "VERSION " << LT(0)->getText() << std::endl;
consumeUntil(NEWLINE);
#line 250 "PIXCfgParser.cpp"
#line 247 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -260,7 +257,6 @@ void PIXCfgParser::version() {
}
void PIXCfgParser::hostname() {
Tracer traceInOut(this, "hostname");
try { // for error handling
match(HOSTNAME);
@ -290,7 +286,7 @@ void PIXCfgParser::hostname() {
<< "LT0=" << LT(0)->getText()
<< std::endl;
#line 294 "PIXCfgParser.cpp"
#line 290 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -304,7 +300,6 @@ void PIXCfgParser::hostname() {
}
void PIXCfgParser::ip_commands() {
Tracer traceInOut(this, "ip_commands");
try { // for error handling
match(IP);
@ -343,7 +338,6 @@ void PIXCfgParser::ip_commands() {
}
void PIXCfgParser::intrface() {
Tracer traceInOut(this, "intrface");
ANTLR_USE_NAMESPACE(antlr)RefToken in = ANTLR_USE_NAMESPACE(antlr)nullToken;
try { // for error handling
@ -359,7 +353,7 @@ void PIXCfgParser::intrface() {
<< " INTRFACE: " << in->getText() << std::endl;
consumeUntil(NEWLINE);
#line 363 "PIXCfgParser.cpp"
#line 357 "PIXCfgParser.cpp"
}
{ // ( ... )+
int _cnt98=0;
@ -387,7 +381,6 @@ void PIXCfgParser::intrface() {
}
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
@ -400,7 +393,7 @@ void PIXCfgParser::vlan_interface() {
importer->setInterfaceVlanId(vlan_id->getText());
*dbg << " VLAN: " << vlan_id->getText() << std::endl;
#line 404 "PIXCfgParser.cpp"
#line 397 "PIXCfgParser.cpp"
}
match(NEWLINE);
}
@ -415,7 +408,6 @@ void PIXCfgParser::vlan_interface() {
}
void PIXCfgParser::switchport() {
Tracer traceInOut(this, "switchport");
ANTLR_USE_NAMESPACE(antlr)RefToken vlan_num = ANTLR_USE_NAMESPACE(antlr)nullToken;
try { // for error handling
@ -430,7 +422,7 @@ void PIXCfgParser::switchport() {
importer->addMessageToLog("Switch port vlan " + vlan_num->getText());
*dbg << "Switch port vlan " << vlan_num->getText() << std::endl;
#line 434 "PIXCfgParser.cpp"
#line 426 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -444,7 +436,6 @@ void PIXCfgParser::switchport() {
}
void PIXCfgParser::shutdown() {
Tracer traceInOut(this, "shutdown");
try { // for error handling
match(SHUTDOWN);
@ -455,7 +446,7 @@ void PIXCfgParser::shutdown() {
*dbg<< LT(1)->getLine() << ":"
<< " INTERFACE SHUTDOWN " << std::endl;
#line 459 "PIXCfgParser.cpp"
#line 450 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -469,7 +460,6 @@ void PIXCfgParser::shutdown() {
}
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
@ -482,7 +472,7 @@ void PIXCfgParser::sec_level() {
importer->setInterfaceSecurityLevel(sec_level->getText());
*dbg << "SEC_LEVEL: " << sec_level->getText() << std::endl;
#line 486 "PIXCfgParser.cpp"
#line 476 "PIXCfgParser.cpp"
}
match(NEWLINE);
}
@ -497,7 +487,6 @@ void PIXCfgParser::sec_level() {
}
void PIXCfgParser::nameif() {
Tracer traceInOut(this, "nameif");
ANTLR_USE_NAMESPACE(antlr)RefToken phys_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;
@ -537,7 +526,7 @@ void PIXCfgParser::nameif() {
*dbg << " NAMEIF: "
<< phys_intf->getText() << label << seclevel << std::endl;
#line 541 "PIXCfgParser.cpp"
#line 530 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -551,7 +540,6 @@ void PIXCfgParser::nameif() {
}
void PIXCfgParser::controller() {
Tracer traceInOut(this, "controller");
try { // for error handling
match(CONTROLLER);
@ -561,7 +549,7 @@ void PIXCfgParser::controller() {
importer->clearCurrentInterface();
consumeUntil(NEWLINE);
#line 565 "PIXCfgParser.cpp"
#line 553 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -575,7 +563,6 @@ 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
@ -590,7 +577,7 @@ void PIXCfgParser::access_list_commands() {
*dbg << acl_num->getLine() << ":"
<< " ACL #" << acl_num->getText() << " ";
#line 594 "PIXCfgParser.cpp"
#line 581 "PIXCfgParser.cpp"
}
{
switch ( LA(1)) {
@ -627,7 +614,6 @@ void PIXCfgParser::access_list_commands() {
}
void PIXCfgParser::exit() {
Tracer traceInOut(this, "exit");
try { // for error handling
match(EXIT);
@ -643,7 +629,6 @@ void PIXCfgParser::exit() {
}
void PIXCfgParser::certificate() {
Tracer traceInOut(this, "certificate");
try { // for error handling
match(CERTIFICATE);
@ -654,7 +639,7 @@ void PIXCfgParser::certificate() {
consumeUntil(NEWLINE);
consumeUntil(QUIT);
#line 658 "PIXCfgParser.cpp"
#line 643 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -668,7 +653,6 @@ void PIXCfgParser::certificate() {
}
void PIXCfgParser::quit() {
Tracer traceInOut(this, "quit");
try { // for error handling
match(QUIT);
@ -677,7 +661,7 @@ void PIXCfgParser::quit() {
consumeUntil(NEWLINE);
#line 681 "PIXCfgParser.cpp"
#line 665 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -691,7 +675,6 @@ void PIXCfgParser::quit() {
}
void PIXCfgParser::names_section() {
Tracer traceInOut(this, "names_section");
try { // for error handling
match(NAMES);
@ -703,7 +686,7 @@ void PIXCfgParser::names_section() {
"Import of configuration that uses \"names\" "
"is not supported at this time");
#line 707 "PIXCfgParser.cpp"
#line 690 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -717,7 +700,6 @@ 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;
@ -734,7 +716,7 @@ void PIXCfgParser::name_entry() {
"Name " + a->getText() + " " + n->getText());
*dbg << "Name " << a->getText() << " " << n->getText() << std::endl;
#line 738 "PIXCfgParser.cpp"
#line 720 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -748,7 +730,6 @@ 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
@ -765,7 +746,7 @@ void PIXCfgParser::named_object_network() {
<< " Named Object " << name->getText() << std::endl;
importer->clear();
#line 769 "PIXCfgParser.cpp"
#line 750 "PIXCfgParser.cpp"
}
{ // ( ... )+
int _cnt12=0;
@ -793,7 +774,6 @@ 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
@ -810,7 +790,7 @@ void PIXCfgParser::named_object_service() {
<< " Named Object " << name->getText() << std::endl;
importer->clear();
#line 814 "PIXCfgParser.cpp"
#line 794 "PIXCfgParser.cpp"
}
{ // ( ... )+
int _cnt25=0;
@ -838,7 +818,6 @@ void PIXCfgParser::named_object_service() {
}
void PIXCfgParser::crypto() {
Tracer traceInOut(this, "crypto");
try { // for error handling
match(CRYPTO);
@ -847,7 +826,7 @@ void PIXCfgParser::crypto() {
consumeUntil(NEWLINE);
#line 851 "PIXCfgParser.cpp"
#line 830 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -861,7 +840,6 @@ void PIXCfgParser::crypto() {
}
void PIXCfgParser::unknown_command() {
Tracer traceInOut(this, "unknown_command");
try { // for error handling
match(WORD);
@ -870,7 +848,7 @@ void PIXCfgParser::unknown_command() {
consumeUntil(NEWLINE);
#line 874 "PIXCfgParser.cpp"
#line 852 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -884,7 +862,6 @@ void PIXCfgParser::unknown_command() {
}
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
@ -898,7 +875,7 @@ void PIXCfgParser::ip_access_list_ext() {
*dbg << name->getLine() << ":"
<< " ACL ext " << name->getText() << std::endl;
#line 902 "PIXCfgParser.cpp"
#line 879 "PIXCfgParser.cpp"
}
{
switch ( LA(1)) {
@ -940,7 +917,7 @@ void PIXCfgParser::ip_access_list_ext() {
*dbg << LT(0)->getLine() << ":"
<< " ACL line end" << std::endl << std::endl;
#line 944 "PIXCfgParser.cpp"
#line 921 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -954,7 +931,6 @@ void PIXCfgParser::ip_access_list_ext() {
}
void PIXCfgParser::community_list_command() {
Tracer traceInOut(this, "community_list_command");
try { // for error handling
match(COMMUNITY_LIST);
@ -963,7 +939,7 @@ void PIXCfgParser::community_list_command() {
consumeUntil(NEWLINE);
#line 967 "PIXCfgParser.cpp"
#line 943 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -977,7 +953,6 @@ void PIXCfgParser::community_list_command() {
}
void PIXCfgParser::named_object_network_parameters() {
Tracer traceInOut(this, "named_object_network_parameters");
try { // for error handling
match(NEWLINE);
@ -1026,7 +1001,6 @@ void PIXCfgParser::named_object_network_parameters() {
}
void PIXCfgParser::named_object_nat() {
Tracer traceInOut(this, "named_object_nat");
try { // for error handling
match(NAT);
@ -1039,7 +1013,7 @@ void PIXCfgParser::named_object_nat() {
"is not supported at this time");
consumeUntil(NEWLINE);
#line 1043 "PIXCfgParser.cpp"
#line 1017 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -1053,7 +1027,6 @@ void PIXCfgParser::named_object_nat() {
}
void PIXCfgParser::named_object_description() {
Tracer traceInOut(this, "named_object_description");
try { // for error handling
match(DESCRIPTION);
@ -1070,7 +1043,7 @@ void PIXCfgParser::named_object_description() {
importer->named_object_comment = descr;
*dbg << " DESCRIPTION " << descr << std::endl;
#line 1074 "PIXCfgParser.cpp"
#line 1047 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -1084,7 +1057,6 @@ void PIXCfgParser::named_object_description() {
}
void PIXCfgParser::host_addr() {
Tracer traceInOut(this, "host_addr");
ANTLR_USE_NAMESPACE(antlr)RefToken h = ANTLR_USE_NAMESPACE(antlr)nullToken;
try { // for error handling
@ -1101,7 +1073,7 @@ void PIXCfgParser::host_addr() {
importer->commitNamedAddressObject();
*dbg << h->getText() << "/255.255.255.255";
#line 1105 "PIXCfgParser.cpp"
#line 1077 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -1115,7 +1087,6 @@ 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;
@ -1135,7 +1106,7 @@ void PIXCfgParser::range_addr() {
importer->commitNamedAddressRangeObject();
*dbg << r1->getText() << "/" << r2->getText();
#line 1139 "PIXCfgParser.cpp"
#line 1110 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -1149,7 +1120,6 @@ 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;
@ -1169,7 +1139,7 @@ void PIXCfgParser::subnet_addr() {
importer->commitNamedAddressObject();
*dbg << a->getText() << "/" << nm->getText();
#line 1173 "PIXCfgParser.cpp"
#line 1143 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -1183,7 +1153,6 @@ void PIXCfgParser::subnet_addr() {
}
void PIXCfgParser::named_object_service_parameters() {
Tracer traceInOut(this, "named_object_service_parameters");
try { // for error handling
match(NEWLINE);
@ -1192,7 +1161,7 @@ void PIXCfgParser::named_object_service_parameters() {
importer->setCurrentLineNumber(LT(0)->getLine());
#line 1196 "PIXCfgParser.cpp"
#line 1165 "PIXCfgParser.cpp"
}
{
if ((LA(1) == DESCRIPTION)) {
@ -1227,7 +1196,6 @@ 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;
@ -1245,7 +1213,7 @@ void PIXCfgParser::service_icmp() {
importer->icmp_type = LT(0)->getText();
#line 1249 "PIXCfgParser.cpp"
#line 1217 "PIXCfgParser.cpp"
}
break;
}
@ -1258,7 +1226,7 @@ void PIXCfgParser::service_icmp() {
importer->icmp_spec = icmp_word->getText();
#line 1262 "PIXCfgParser.cpp"
#line 1230 "PIXCfgParser.cpp"
}
break;
}
@ -1274,7 +1242,7 @@ void PIXCfgParser::service_icmp() {
importer->commitNamedICMPServiceObject();
*dbg << "NAMED OBJECT SERVICE ICMP " << LT(0)->getText() << " ";
#line 1278 "PIXCfgParser.cpp"
#line 1246 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -1288,7 +1256,6 @@ void PIXCfgParser::service_icmp() {
}
void PIXCfgParser::service_icmp6() {
Tracer traceInOut(this, "service_icmp6");
try { // for error handling
match(SERVICE);
@ -1320,7 +1287,7 @@ void PIXCfgParser::service_icmp6() {
*dbg << "NAMED OBJECT SERVICE ICMP6 " << LT(0)->getText() << " ";
consumeUntil(NEWLINE);
#line 1324 "PIXCfgParser.cpp"
#line 1291 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -1334,7 +1301,6 @@ void PIXCfgParser::service_icmp6() {
}
void PIXCfgParser::service_tcp_udp() {
Tracer traceInOut(this, "service_tcp_udp");
try { // for error handling
match(SERVICE);
@ -1362,7 +1328,7 @@ void PIXCfgParser::service_tcp_udp() {
importer->protocol = LT(0)->getText();
*dbg << "NAMED OBJECT SERVICE " << LT(0)->getText() << " ";
#line 1366 "PIXCfgParser.cpp"
#line 1332 "PIXCfgParser.cpp"
}
{
switch ( LA(1)) {
@ -1450,7 +1416,7 @@ void PIXCfgParser::service_tcp_udp() {
importer->commitNamedTCPUDPServiceObject();
#line 1454 "PIXCfgParser.cpp"
#line 1420 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -1464,7 +1430,6 @@ void PIXCfgParser::service_tcp_udp() {
}
void PIXCfgParser::service_other() {
Tracer traceInOut(this, "service_other");
ANTLR_USE_NAMESPACE(antlr)RefToken n = ANTLR_USE_NAMESPACE(antlr)nullToken;
try { // for error handling
@ -1478,7 +1443,7 @@ void PIXCfgParser::service_other() {
importer->commitNamedIPServiceObject();
*dbg << "NAMED OBJECT SERVICE " << LT(0)->getText() << " ";
#line 1482 "PIXCfgParser.cpp"
#line 1447 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -1492,7 +1457,6 @@ void PIXCfgParser::service_other() {
}
void PIXCfgParser::src_port_spec() {
Tracer traceInOut(this, "src_port_spec");
try { // for error handling
match(SOURCE);
@ -1502,7 +1466,7 @@ void PIXCfgParser::src_port_spec() {
importer->SaveTmpPortToSrc();
#line 1506 "PIXCfgParser.cpp"
#line 1470 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -1516,7 +1480,6 @@ void PIXCfgParser::src_port_spec() {
}
void PIXCfgParser::dst_port_spec() {
Tracer traceInOut(this, "dst_port_spec");
try { // for error handling
match(DESTINATION);
@ -1526,7 +1489,7 @@ void PIXCfgParser::dst_port_spec() {
importer->SaveTmpPortToDst();
#line 1530 "PIXCfgParser.cpp"
#line 1493 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -1540,7 +1503,6 @@ void PIXCfgParser::dst_port_spec() {
}
void PIXCfgParser::xoperator() {
Tracer traceInOut(this, "xoperator");
try { // for error handling
switch ( LA(1)) {
@ -1574,7 +1536,6 @@ void PIXCfgParser::xoperator() {
}
void PIXCfgParser::permit_ext() {
Tracer traceInOut(this, "permit_ext");
try { // for error handling
match(PERMIT);
@ -1586,7 +1547,7 @@ void PIXCfgParser::permit_ext() {
importer->action = "permit";
*dbg << LT(1)->getLine() << ":" << " permit ";
#line 1590 "PIXCfgParser.cpp"
#line 1551 "PIXCfgParser.cpp"
}
rule_ext();
match(NEWLINE);
@ -1595,7 +1556,7 @@ void PIXCfgParser::permit_ext() {
importer->pushRule();
#line 1599 "PIXCfgParser.cpp"
#line 1560 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -1609,7 +1570,6 @@ void PIXCfgParser::permit_ext() {
}
void PIXCfgParser::deny_ext() {
Tracer traceInOut(this, "deny_ext");
try { // for error handling
match(DENY);
@ -1621,7 +1581,7 @@ void PIXCfgParser::deny_ext() {
importer->action = "deny";
*dbg << LT(1)->getLine() << ":" << " deny ";
#line 1625 "PIXCfgParser.cpp"
#line 1585 "PIXCfgParser.cpp"
}
rule_ext();
match(NEWLINE);
@ -1630,7 +1590,7 @@ void PIXCfgParser::deny_ext() {
importer->pushRule();
#line 1634 "PIXCfgParser.cpp"
#line 1594 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -1644,7 +1604,6 @@ void PIXCfgParser::deny_ext() {
}
void PIXCfgParser::remark() {
Tracer traceInOut(this, "remark");
try { // for error handling
match(REMARK);
@ -1662,7 +1621,7 @@ void PIXCfgParser::remark() {
*dbg << " REMARK " << rem << std::endl;
//consumeUntil(NEWLINE);
#line 1666 "PIXCfgParser.cpp"
#line 1625 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -1676,7 +1635,6 @@ void PIXCfgParser::remark() {
}
void PIXCfgParser::rule_ext() {
Tracer traceInOut(this, "rule_ext");
try { // for error handling
{
@ -1689,13 +1647,13 @@ void PIXCfgParser::rule_ext() {
if ( inputState->guessing==0 ) {
#line 460 "pix.g"
importer->SaveTmpAddrToSrc(); *dbg << "(src) ";
#line 1693 "PIXCfgParser.cpp"
#line 1651 "PIXCfgParser.cpp"
}
hostaddr_ext();
if ( inputState->guessing==0 ) {
#line 461 "pix.g"
importer->SaveTmpAddrToDst(); *dbg << "(dst) ";
#line 1699 "PIXCfgParser.cpp"
#line 1657 "PIXCfgParser.cpp"
}
{
switch ( LA(1)) {
@ -1765,19 +1723,19 @@ void PIXCfgParser::rule_ext() {
importer->protocol = LT(0)->getText();
*dbg << "protocol " << LT(0)->getText() << " ";
#line 1769 "PIXCfgParser.cpp"
#line 1727 "PIXCfgParser.cpp"
}
hostaddr_ext();
if ( inputState->guessing==0 ) {
#line 471 "pix.g"
importer->SaveTmpAddrToSrc(); *dbg << "(src) ";
#line 1775 "PIXCfgParser.cpp"
#line 1733 "PIXCfgParser.cpp"
}
hostaddr_ext();
if ( inputState->guessing==0 ) {
#line 472 "pix.g"
importer->SaveTmpAddrToDst(); *dbg << "(dst) ";
#line 1781 "PIXCfgParser.cpp"
#line 1739 "PIXCfgParser.cpp"
}
{
switch ( LA(1)) {
@ -1887,13 +1845,13 @@ void PIXCfgParser::rule_ext() {
importer->protocol = LT(0)->getText();
*dbg << "protocol " << LT(0)->getText() << " ";
#line 1891 "PIXCfgParser.cpp"
#line 1849 "PIXCfgParser.cpp"
}
hostaddr_ext();
if ( inputState->guessing==0 ) {
#line 483 "pix.g"
importer->SaveTmpAddrToSrc(); *dbg << "(src) ";
#line 1897 "PIXCfgParser.cpp"
#line 1855 "PIXCfgParser.cpp"
}
{
switch ( LA(1)) {
@ -1907,7 +1865,7 @@ void PIXCfgParser::rule_ext() {
if ( inputState->guessing==0 ) {
#line 484 "pix.g"
importer->SaveTmpPortToSrc();
#line 1911 "PIXCfgParser.cpp"
#line 1869 "PIXCfgParser.cpp"
}
break;
}
@ -1927,7 +1885,7 @@ void PIXCfgParser::rule_ext() {
if ( inputState->guessing==0 ) {
#line 485 "pix.g"
importer->SaveTmpAddrToDst(); *dbg << "(dst) ";
#line 1931 "PIXCfgParser.cpp"
#line 1889 "PIXCfgParser.cpp"
}
{
switch ( LA(1)) {
@ -1941,7 +1899,7 @@ void PIXCfgParser::rule_ext() {
if ( inputState->guessing==0 ) {
#line 486 "pix.g"
importer->SaveTmpPortToDst();
#line 1945 "PIXCfgParser.cpp"
#line 1903 "PIXCfgParser.cpp"
}
break;
}
@ -2051,7 +2009,7 @@ void PIXCfgParser::rule_ext() {
*dbg << std::endl;
#line 2055 "PIXCfgParser.cpp"
#line 2013 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -2065,7 +2023,6 @@ void PIXCfgParser::rule_ext() {
}
void PIXCfgParser::ip_protocols() {
Tracer traceInOut(this, "ip_protocols");
try { // for error handling
{
@ -2092,7 +2049,7 @@ void PIXCfgParser::ip_protocols() {
importer->protocol = LT(0)->getText();
*dbg << "protocol " << LT(0)->getText() << " ";
#line 2096 "PIXCfgParser.cpp"
#line 2053 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -2106,7 +2063,6 @@ 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;
@ -2127,7 +2083,7 @@ void PIXCfgParser::hostaddr_ext() {
importer->tmp_nm = "255.255.255.255";
*dbg << h->getText() << "/255.255.255.255";
#line 2131 "PIXCfgParser.cpp"
#line 2087 "PIXCfgParser.cpp"
}
break;
}
@ -2146,7 +2102,7 @@ void PIXCfgParser::hostaddr_ext() {
importer->tmp_nm = m->getText();
*dbg << a->getText() << "/" << m->getText();
#line 2150 "PIXCfgParser.cpp"
#line 2106 "PIXCfgParser.cpp"
}
break;
}
@ -2160,7 +2116,7 @@ void PIXCfgParser::hostaddr_ext() {
importer->tmp_nm = "0.0.0.0";
*dbg << "0.0.0.0/0.0.0.0";
#line 2164 "PIXCfgParser.cpp"
#line 2120 "PIXCfgParser.cpp"
}
break;
}
@ -2181,7 +2137,6 @@ 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
@ -2194,7 +2149,7 @@ void PIXCfgParser::time_range() {
importer->time_range_name = tr_name->getText();
*dbg << "time_range " << tr_name->getText() << " ";
#line 2198 "PIXCfgParser.cpp"
#line 2153 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -2208,7 +2163,6 @@ void PIXCfgParser::time_range() {
}
void PIXCfgParser::fragments() {
Tracer traceInOut(this, "fragments");
try { // for error handling
match(FRAGMENTS);
@ -2218,7 +2172,7 @@ void PIXCfgParser::fragments() {
importer->fragments = true;
*dbg << "fragments ";
#line 2222 "PIXCfgParser.cpp"
#line 2176 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -2232,7 +2186,6 @@ void PIXCfgParser::fragments() {
}
void PIXCfgParser::log() {
Tracer traceInOut(this, "log");
try { // for error handling
{
@ -2259,7 +2212,7 @@ void PIXCfgParser::log() {
importer->logging = true;
*dbg << "logging ";
#line 2263 "PIXCfgParser.cpp"
#line 2216 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -2273,7 +2226,6 @@ 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;
@ -2298,7 +2250,7 @@ void PIXCfgParser::icmp_spec() {
*dbg << icmp_type->getText() << " "
<< icmp_code->getText() << " ";
#line 2302 "PIXCfgParser.cpp"
#line 2254 "PIXCfgParser.cpp"
}
break;
}
@ -2312,7 +2264,7 @@ void PIXCfgParser::icmp_spec() {
importer->icmp_spec = icmp_word->getText();
*dbg << icmp_word->getText() << " ";
#line 2316 "PIXCfgParser.cpp"
#line 2268 "PIXCfgParser.cpp"
}
break;
}
@ -2334,7 +2286,6 @@ void PIXCfgParser::icmp_spec() {
}
void PIXCfgParser::established() {
Tracer traceInOut(this, "established");
try { // for error handling
match(ESTABLISHED);
@ -2344,7 +2295,7 @@ void PIXCfgParser::established() {
importer->established = true;
*dbg << "established ";
#line 2348 "PIXCfgParser.cpp"
#line 2299 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -2358,7 +2309,6 @@ void PIXCfgParser::established() {
}
void PIXCfgParser::single_port_op() {
Tracer traceInOut(this, "single_port_op");
try { // for error handling
{
@ -2395,7 +2345,7 @@ void PIXCfgParser::single_port_op() {
importer->tmp_port_op = LT(0)->getText();
*dbg << LT(0)->getText() << " ";
#line 2399 "PIXCfgParser.cpp"
#line 2349 "PIXCfgParser.cpp"
}
port_spec();
}
@ -2410,7 +2360,6 @@ void PIXCfgParser::single_port_op() {
}
void PIXCfgParser::port_range() {
Tracer traceInOut(this, "port_range");
try { // for error handling
match(RANGE);
@ -2421,7 +2370,7 @@ void PIXCfgParser::port_range() {
importer->tmp_port_op = "range";
*dbg << "range ";
#line 2425 "PIXCfgParser.cpp"
#line 2374 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -2435,7 +2384,6 @@ void PIXCfgParser::port_range() {
}
void PIXCfgParser::port_spec() {
Tracer traceInOut(this, "port_spec");
try { // for error handling
{
@ -2462,7 +2410,7 @@ void PIXCfgParser::port_spec() {
importer->tmp_port_spec = (std::string(" ") + LT(0)->getText());
*dbg << LT(0)->getText() << " " << importer->tmp_port_spec;
#line 2466 "PIXCfgParser.cpp"
#line 2414 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -2476,7 +2424,6 @@ 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;
@ -2534,7 +2481,7 @@ void PIXCfgParser::pair_of_ports_spec() {
if (e2) importer->tmp_port_spec += e2->getText();
*dbg << "pair of ports: " << importer->tmp_port_spec;
#line 2538 "PIXCfgParser.cpp"
#line 2485 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -2548,7 +2495,6 @@ 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;
@ -2566,7 +2512,7 @@ void PIXCfgParser::hostaddr_std() {
importer->tmp_nm = "0.0.0.0";
*dbg << h->getText() << "/0.0.0.0";
#line 2570 "PIXCfgParser.cpp"
#line 2516 "PIXCfgParser.cpp"
}
}
else if ((LA(1) == IPV4) && (LA(2) == IPV4)) {
@ -2583,7 +2529,7 @@ void PIXCfgParser::hostaddr_std() {
importer->tmp_nm = m->getText();
*dbg << a->getText() << "/" << m->getText();
#line 2587 "PIXCfgParser.cpp"
#line 2533 "PIXCfgParser.cpp"
}
}
else if ((LA(1) == ANY)) {
@ -2595,7 +2541,7 @@ void PIXCfgParser::hostaddr_std() {
importer->tmp_nm = "0.0.0.0";
*dbg << "0.0.0.0/0.0.0.0";
#line 2599 "PIXCfgParser.cpp"
#line 2545 "PIXCfgParser.cpp"
}
}
else {
@ -2614,7 +2560,6 @@ void PIXCfgParser::hostaddr_std() {
}
void PIXCfgParser::interface_parameters() {
Tracer traceInOut(this, "interface_parameters");
try { // for error handling
match(NEWLINE);
@ -2623,7 +2568,7 @@ void PIXCfgParser::interface_parameters() {
importer->setCurrentLineNumber(LT(0)->getLine());
#line 2627 "PIXCfgParser.cpp"
#line 2572 "PIXCfgParser.cpp"
}
{
switch ( LA(1)) {
@ -2680,7 +2625,6 @@ void PIXCfgParser::interface_parameters() {
}
void PIXCfgParser::intf_address() {
Tracer traceInOut(this, "intf_address");
try { // for error handling
match(IP);
@ -2716,7 +2660,6 @@ void PIXCfgParser::intf_address() {
}
void PIXCfgParser::interface_description() {
Tracer traceInOut(this, "interface_description");
try { // for error handling
match(DESCRIPTION);
@ -2734,7 +2677,7 @@ void PIXCfgParser::interface_description() {
*dbg << " DESCRIPTION " << descr << std::endl;
//consumeUntil(NEWLINE);
#line 2738 "PIXCfgParser.cpp"
#line 2681 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -2748,7 +2691,6 @@ void PIXCfgParser::interface_description() {
}
void PIXCfgParser::interface_known_commands() {
Tracer traceInOut(this, "interface_known_commands");
try { // for error handling
{
@ -2767,7 +2709,6 @@ void PIXCfgParser::interface_known_commands() {
}
void PIXCfgParser::v6_ip_address() {
Tracer traceInOut(this, "v6_ip_address");
try { // for error handling
if ((LA(1) == WORD) && (LA(2) == DHCP)) {
@ -2792,7 +2733,6 @@ void PIXCfgParser::v6_ip_address() {
}
void PIXCfgParser::v7_ip_address() {
Tracer traceInOut(this, "v7_ip_address");
try { // for error handling
switch ( LA(1)) {
@ -2823,7 +2763,6 @@ 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;
@ -2844,7 +2783,7 @@ void PIXCfgParser::v6_dhcp_address() {
// which we do not support
consumeUntil(NEWLINE);
#line 2848 "PIXCfgParser.cpp"
#line 2787 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -2858,7 +2797,6 @@ 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;
@ -2882,7 +2820,7 @@ void PIXCfgParser::v6_static_address() {
// in case there are some other parameters after address and netmask
consumeUntil(NEWLINE);
#line 2886 "PIXCfgParser.cpp"
#line 2824 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -2896,7 +2834,6 @@ 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
@ -2911,7 +2848,7 @@ void PIXCfgParser::v7_dhcp_address() {
<< " INTRFACE ADDRESS: " << addr << std::endl;
consumeUntil(NEWLINE);
#line 2915 "PIXCfgParser.cpp"
#line 2852 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -2925,7 +2862,6 @@ 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;
@ -2994,7 +2930,7 @@ void PIXCfgParser::v7_static_address() {
}
consumeUntil(NEWLINE);
#line 2998 "PIXCfgParser.cpp"
#line 2934 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@ -3008,7 +2944,6 @@ 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;
@ -3034,7 +2969,7 @@ void PIXCfgParser::access_group_by_name() {
<< " " << intf_label->getText()
<< " " << dir->getText() << std::endl;
#line 3038 "PIXCfgParser.cpp"
#line 2973 "PIXCfgParser.cpp"
}
}
catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {

2
src/parsers/iosacl.g
View File

@ -51,7 +51,7 @@ header "post_include_cpp"
#include <antlr/Token.hpp>
#include <antlr/TokenBuffer.hpp>
#include "../libgui/IOSImporter.h"
#include "IOSImporter.h"
}
header

2
src/parsers/iptables.g
View File

@ -51,7 +51,7 @@ header "post_include_cpp"
#include <antlr/Token.hpp>
#include <antlr/TokenBuffer.hpp>
#include "../libgui/IPTImporter.h"
#include "IPTImporter.h"
#include "fwbuilder/TCPService.h"
#include "fwbuilder/Logger.h"

2
src/parsers/parsers.pro
View File

@ -25,7 +25,7 @@ HEADERS = ../../config.h \
CONFIG += staticlib
INCLUDEPATH += $$ANTLR_INCLUDEPATH ../libfwbuilder/src/
INCLUDEPATH += $$ANTLR_INCLUDEPATH ../import ../libfwbuilder/src/
LIBS += $$ANTLR_LIBS
DEFINES += $$ANTLR_DEFINES

2
src/parsers/pix.g
View File

@ -49,7 +49,7 @@ header "post_include_cpp"
#include <antlr/Token.hpp>
#include <antlr/TokenBuffer.hpp>
#include "../libgui/PIXImporter.h"
#include "PIXImporter.h"
}
header

3
src/src.pro
View File

@ -11,8 +11,9 @@ TARGET = src
SUBDIRS = libfwbuilder \
res \
parsers \
antlr \
parsers \
import \
common \
compiler_lib \
fwbedit \