see #2354 fixed parser to recognize top level "ip" commands that we do not use but that should not cause parser error

Author: Vadim Kurland

src/parsers/IOSCfgLexer.cpp

@@ -102,6 +102,7 @@ class CUSTOM_API IOSCfgParser : public ANTLR_USE_NAMESPACE(antlr)LLkParser, publ
 	public: void ip_access_list_ext();
 	public: void interface_known_ip_commands();
 	public: void community_list_command();
+	public: void ip_unused_command();
 	public: void permit_std();
 	public: void deny_std();
 	public: void permit_ext();
@@ -135,10 +136,10 @@ class CUSTOM_API IOSCfgParser : public ANTLR_USE_NAMESPACE(antlr)LLkParser, publ
 private:
 	static const char* tokenNames[];
 #ifndef NO_STATIC_CONSTS
-	static const int NUM_TOKENS = 79;
+	static const int NUM_TOKENS = 80;
 #else
 	enum {
-		NUM_TOKENS = 79
+		NUM_TOKENS = 80
 	};
 #endif
 

src/parsers/IOSCfgParser.cpp

@@ -15,27 +15,27 @@ struct CUSTOM_API IOSCfgParserTokenTypes {
 		NEWLINE = 4,
 		IP = 5,
 		QUIT = 6,
-		COMMUNITY_LIST = 7,
-		WORD = 8,
-		CERTIFICATE = 9,
-		IOSVERSION = 10,
-		NUMBER = 11,
-		HOSTNAME = 12,
-		STRING = 13,
-		ACCESS_LIST = 14,
-		INT_CONST = 15,
-		EXTENDED = 16,
-		PERMIT = 17,
-		DENY = 18,
-		ICMP = 19,
-		TCP = 20,
-		UDP = 21,
-		P_EQ = 22,
-		P_GT = 23,
-		P_LT = 24,
-		P_NEQ = 25,
-		P_RANGE = 26,
-		HOST = 27,
+		ICMP = 7,
+		TCP = 8,
+		HOST = 9,
+		COMMUNITY_LIST = 10,
+		WORD = 11,
+		CERTIFICATE = 12,
+		IOSVERSION = 13,
+		NUMBER = 14,
+		HOSTNAME = 15,
+		STRING = 16,
+		ACCESS_LIST = 17,
+		INT_CONST = 18,
+		EXTENDED = 19,
+		PERMIT = 20,
+		DENY = 21,
+		UDP = 22,
+		P_EQ = 23,
+		P_GT = 24,
+		P_LT = 25,
+		P_NEQ = 26,
+		P_RANGE = 27,
 		IPV4 = 28,
 		ANY = 29,
 		LOG = 30,
@@ -46,47 +46,48 @@ struct CUSTOM_API IOSCfgParserTokenTypes {
 		VLAN = 35,
 		CONTROLLER = 36,
 		INTRFACE = 37,
-		DESCRIPTION = 38,
-		REMARK = 39,
-		SHUTDOWN = 40,
-		ACCESS_GROUP = 41,
-		ADDRESS = 42,
-		SECONDARY = 43,
-		EXIT = 44,
-		LINE_COMMENT = 45,
-		STANDARD = 46,
-		Whitespace = 47,
-		HEX_CONST = 48,
-		NEG_INT_CONST = 49,
-		DIGIT = 50,
-		HEXDIGIT = 51,
-		PIPE_CHAR = 52,
-		NUMBER_SIGN = 53,
-		PERCENT = 54,
-		AMPERSAND = 55,
-		APOSTROPHE = 56,
-		OPENING_PAREN = 57,
-		CLOSING_PAREN = 58,
-		STAR = 59,
-		PLUS = 60,
-		COMMA = 61,
-		MINUS = 62,
-		DOT = 63,
-		SLASH = 64,
-		COLON = 65,
-		SEMICOLON = 66,
-		LESS_THAN = 67,
-		EQUALS = 68,
-		GREATER_THAN = 69,
-		QUESTION = 70,
-		COMMERCIAL_AT = 71,
-		OPENING_SQUARE = 72,
-		CLOSING_SQUARE = 73,
-		CARET = 74,
-		UNDERLINE = 75,
-		OPENING_BRACE = 76,
-		CLOSING_BRACE = 77,
-		TILDE = 78,
+		POINT_TO_POINT = 38,
+		DESCRIPTION = 39,
+		REMARK = 40,
+		SHUTDOWN = 41,
+		ACCESS_GROUP = 42,
+		ADDRESS = 43,
+		SECONDARY = 44,
+		EXIT = 45,
+		LINE_COMMENT = 46,
+		STANDARD = 47,
+		Whitespace = 48,
+		HEX_CONST = 49,
+		NEG_INT_CONST = 50,
+		DIGIT = 51,
+		HEXDIGIT = 52,
+		PIPE_CHAR = 53,
+		NUMBER_SIGN = 54,
+		PERCENT = 55,
+		AMPERSAND = 56,
+		APOSTROPHE = 57,
+		OPENING_PAREN = 58,
+		CLOSING_PAREN = 59,
+		STAR = 60,
+		PLUS = 61,
+		COMMA = 62,
+		MINUS = 63,
+		DOT = 64,
+		SLASH = 65,
+		COLON = 66,
+		SEMICOLON = 67,
+		LESS_THAN = 68,
+		EQUALS = 69,
+		GREATER_THAN = 70,
+		QUESTION = 71,
+		COMMERCIAL_AT = 72,
+		OPENING_SQUARE = 73,
+		CLOSING_SQUARE = 74,
+		CARET = 75,
+		UNDERLINE = 76,
+		OPENING_BRACE = 77,
+		CLOSING_BRACE = 78,
+		TILDE = 79,
 		NULL_TREE_LOOKAHEAD = 3
 	};
 #ifdef __cplusplus

src/parsers/IOSCfgParser.hpp

@@ -3,27 +3,27 @@ IOSCfgParser    // output token vocab name
 NEWLINE=4
 IP="ip"=5
 QUIT="quit"=6
-COMMUNITY_LIST="community-list"=7
-WORD=8
-CERTIFICATE="certificate"=9
-IOSVERSION="version"=10
-NUMBER=11
-HOSTNAME="hostname"=12
-STRING=13
-ACCESS_LIST="access-list"=14
-INT_CONST=15
-EXTENDED="extended"=16
-PERMIT="permit"=17
-DENY="deny"=18
-ICMP="icmp"=19
-TCP="tcp"=20
-UDP="udp"=21
-P_EQ="eq"=22
-P_GT="gt"=23
-P_LT="lt"=24
-P_NEQ="neq"=25
-P_RANGE="range"=26
-HOST="host"=27
+ICMP="icmp"=7
+TCP="tcp"=8
+HOST="host"=9
+COMMUNITY_LIST="community-list"=10
+WORD=11
+CERTIFICATE="certificate"=12
+IOSVERSION="version"=13
+NUMBER=14
+HOSTNAME="hostname"=15
+STRING=16
+ACCESS_LIST="access-list"=17
+INT_CONST=18
+EXTENDED="extended"=19
+PERMIT="permit"=20
+DENY="deny"=21
+UDP="udp"=22
+P_EQ="eq"=23
+P_GT="gt"=24
+P_LT="lt"=25
+P_NEQ="neq"=26
+P_RANGE="range"=27
 IPV4=28
 ANY="any"=29
 LOG="log"=30
@@ -34,44 +34,45 @@ TIME_RANGE="time-range"=34
 VLAN="vlan"=35
 CONTROLLER="controller"=36
 INTRFACE="interface"=37
-DESCRIPTION="description"=38
-REMARK="remark"=39
-SHUTDOWN="shutdown"=40
-ACCESS_GROUP="access-group"=41
-ADDRESS="address"=42
-SECONDARY="secondary"=43
-EXIT="exit"=44
-LINE_COMMENT=45
-STANDARD="standard"=46
-Whitespace=47
-HEX_CONST=48
-NEG_INT_CONST=49
-DIGIT=50
-HEXDIGIT=51
-PIPE_CHAR=52
-NUMBER_SIGN=53
-PERCENT=54
-AMPERSAND=55
-APOSTROPHE=56
-OPENING_PAREN=57
-CLOSING_PAREN=58
-STAR=59
-PLUS=60
-COMMA=61
-MINUS=62
-DOT=63
-SLASH=64
-COLON=65
-SEMICOLON=66
-LESS_THAN=67
-EQUALS=68
-GREATER_THAN=69
-QUESTION=70
-COMMERCIAL_AT=71
-OPENING_SQUARE=72
-CLOSING_SQUARE=73
-CARET=74
-UNDERLINE=75
-OPENING_BRACE=76
-CLOSING_BRACE=77
-TILDE=78
+POINT_TO_POINT="point-to-point"=38
+DESCRIPTION="description"=39
+REMARK="remark"=40
+SHUTDOWN="shutdown"=41
+ACCESS_GROUP="access-group"=42
+ADDRESS="address"=43
+SECONDARY="secondary"=44
+EXIT="exit"=45
+LINE_COMMENT=46
+STANDARD="standard"=47
+Whitespace=48
+HEX_CONST=49
+NEG_INT_CONST=50
+DIGIT=51
+HEXDIGIT=52
+PIPE_CHAR=53
+NUMBER_SIGN=54
+PERCENT=55
+AMPERSAND=56
+APOSTROPHE=57
+OPENING_PAREN=58
+CLOSING_PAREN=59
+STAR=60
+PLUS=61
+COMMA=62
+MINUS=63
+DOT=64
+SLASH=65
+COLON=66
+SEMICOLON=67
+LESS_THAN=68
+EQUALS=69
+GREATER_THAN=70
+QUESTION=71
+COMMERCIAL_AT=72
+OPENING_SQUARE=73
+CLOSING_SQUARE=74
+CARET=75
+UNDERLINE=76
+OPENING_BRACE=77
+CLOSING_BRACE=78
+TILDE=79

src/parsers/IOSCfgParserTokenTypes.hpp

@@ -134,7 +134,18 @@ cfgfile :
 
 //****************************************************************
 
-ip_commands : IP ( ip_access_list_ext | interface_known_ip_commands | community_list_command | unknown_command )
+ip_commands : IP
+        ( 
+            ip_access_list_ext
+        |
+            interface_known_ip_commands
+        |
+            community_list_command
+        |
+            ip_unused_command
+        |
+            unknown_command
+        )
     ;
 
 //****************************************************************
@@ -144,6 +155,17 @@ quit : QUIT
         }
     ;
 
+//****************************************************************
+// these are "ip ..." top level commands that we do not use but parser
+// should not abort on. Unlike unknown_command, these have known token as
+// a second word so they dont match unknown_command which expects WORD.
+
+ip_unused_command : ICMP | TCP | HOST
+        {
+            consumeUntil(NEWLINE);
+        }
+    ;
+
 //****************************************************************
 community_list_command : COMMUNITY_LIST 
         {
@@ -508,6 +530,14 @@ intrface  : INTRFACE in:WORD
             *dbg << in->getLine() << ":"
                 << " INTRFACE: " << in->getText() << std::endl;
         }
+        (
+            POINT_TO_POINT
+            {
+                importer->addMessageToLog(
+                    QString("Warning: point-to-point interfaces "
+                            "are not supported"));
+            }
+        )?
         NEWLINE
     ;
 
@@ -717,6 +747,7 @@ tokens
     EXTENDED = "extended" ;
     STANDARD = "standard" ;
 
+    POINT_TO_POINT = "point-to-point" ;
 }
 
 LINE_COMMENT : "!" (~('\r' | '\n'))* ; // NEWLINE ;