Skip to content

Commit f391eeb

Browse files
afmurilloafmurillo
authored
Merge pull request #28 from afmurillo/dev-paper
Dev paper
2 parents e5bde65 + b061241 commit f391eeb

File tree

17 files changed

+433
-207
lines changed

17 files changed

+433
-207
lines changed

‎dhalsim/network_attacks/concealment_netfilter_queue.py‎

Lines changed: 36 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@
1212

1313
from dhalsim.network_attacks.utilities import translate_payload_to_float, translate_float_to_payload
1414

15+
class Error(Exception):
16+
"""Base class for exceptions in this module."""
17+
18+
class ConcealmentError(Error):
19+
"""Raised when there is an error in the concealment parameter"""
1520

1621
class ConcealmentMiTMNetfilterQueue(PacketQueue):
1722

@@ -20,8 +25,18 @@ def __init__(self, intermediate_yaml_path: Path, yaml_index: int, queue_number:
2025
self.attacked_tag = self.intermediate_attack['tag']
2126
self.scada_session_ids = []
2227
self.attack_session_ids = []
28+
self.concealment_type = None
29+
30+
if 'concealment_data' in self.intermediate_attack.keys():
31+
if self.intermediate_attack['concealment_data']['type'] == 'path':
32+
self.concealment_type = 'path'
33+
self.concealment_data_pd = pd.read_csv(self.intermediate_attack['concealment_data'])
34+
elif self.intermediate_attack['concealment_data']['type'] == 'value':
35+
self.concealment_type = 'value'
36+
else:
37+
raise ConcealmentError("Concealment data type is invalid, supported values are 'concealment_value' or 'concealment_path ")
2338

24-
self.concealment_data_pd = pd.read_csv(self.intermediate_attack['concealment_data'])
39+
self.logger.debug('Concealment type is: ' + str(self.concealment_type))
2540

2641
def capture(self, packet):
2742
"""
@@ -35,20 +50,26 @@ def capture(self, packet):
3550
try:
3651
p = IP(packet.get_payload())
3752
if 'TCP' in p:
38-
if len(p) == 116:
39-
this_session = int.from_bytes(p[Raw].load[4:8], sys.byteorder)
40-
tag_name = p[Raw].load.decode(encoding='latin-1')[54:56]
53+
self.logger.debug('TCP packet')
54+
if len(p) == 118:
55+
this_session = int.from_bytes(p[Raw].load[4:8], sys.byteorder)
56+
tag_name = p[Raw].load.decode(encoding='latin-1')[54:57]
57+
self.logger.debug('Tag name: ' + str(tag_name))
58+
self.logger.debug('Attack tag: ' + self.attacked_tag)
4159
if self.attacked_tag == tag_name:
4260
# This is a packet being sent to SCADA server, conceal the manipulation
4361
if p[IP].src == self.intermediate_yaml['scada']['public_ip']:
62+
self.logger.debug('SCADA Req session')
4463
self.scada_session_ids.append(this_session)
4564
else:
65+
self.logger.debug('PLC Req session')
4666
self.attack_session_ids.append(this_session)
4767

4868
if len(p) == 102:
4969
this_session = int.from_bytes(p[Raw].load[4:8], sys.byteorder)
70+
5071
if this_session in self.attack_session_ids:
51-
value = translate_payload_to_float(p[Raw].load)
72+
#value = translate_payload_to_float(p[Raw].load)
5273

5374
if 'value' in self.intermediate_attack.keys():
5475
p[Raw].load = translate_float_to_payload(
@@ -67,10 +88,16 @@ def capture(self, packet):
6788

6889
elif this_session in self.scada_session_ids:
6990
self.logger.debug('Concealing to SCADA: ' + str(this_session))
70-
exp = (self.concealment_data_pd['iteration'] == self.get_master_clock())
71-
concealment_value = float(self.concealment_data_pd.loc[exp][self.attacked_tag].values[-1])
72-
self.logger.debug('Concealing with value: ' + str(concealment_value))
73-
p[Raw].load = translate_float_to_payload(concealment_value, p[Raw].load)
91+
92+
if self.concealment_type == 'path':
93+
exp = (self.concealment_data_pd['iteration'] == self.get_master_clock())
94+
concealment_value = float(self.concealment_data_pd.loc[exp][self.attacked_tag].values[-1])
95+
self.logger.debug('Concealing with value: ' + str(concealment_value))
96+
p[Raw].load = translate_float_to_payload(concealment_value, p[Raw].load)
97+
elif self.concealment_type == 'value':
98+
concealment_value = self.intermediate_attack['concealment_data']['concealment_value']
99+
self.logger.debug('Concealment value is: ' + str(concealment_value))
100+
p[Raw].load = translate_float_to_payload(concealment_value, p[Raw].load)
74101

75102
del p[IP].chksum
76103
del p[TCP].chksum

‎dhalsim/parser/antlr/controlsLexer.py‎

Lines changed: 79 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -5,82 +5,85 @@
55
import sys
66

77

8+
89
def serializedATN():
910
with StringIO() as buf:
1011
buf.write("\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\2\27")
11-
buf.write("\u00bc\b\1\4\2\t\2\4\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7")
12+
buf.write("\u00be\b\1\4\2\t\2\4\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7")
1213
buf.write("\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13\t\13\4\f\t\f\4\r\t\r")
1314
buf.write("\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22\t\22\4\23")
1415
buf.write("\t\23\4\24\t\24\4\25\t\25\4\26\t\26\3\2\3\2\3\2\3\2\3")
1516
buf.write("\2\3\3\3\3\3\3\3\4\3\4\3\4\3\4\3\4\3\5\3\5\3\5\3\6\3\6")
16-
buf.write("\3\6\3\6\3\6\3\7\3\7\3\7\3\7\3\b\3\b\5\bI\n\b\3\t\3\t")
17-
buf.write("\3\t\3\t\3\t\3\n\3\n\3\n\3\n\3\n\3\n\3\n\3\13\3\13\5\13")
18-
buf.write("Y\n\13\3\f\3\f\3\f\3\f\3\f\3\f\3\r\3\r\3\r\3\r\3\r\3\r")
19-
buf.write("\3\16\7\16h\n\16\f\16\16\16k\13\16\3\16\7\16n\n\16\f\16")
20-
buf.write("\16\16q\13\16\3\16\6\16t\n\16\r\16\16\16u\3\17\6\17y\n")
21-
buf.write("\17\r\17\16\17z\3\20\3\20\7\20\177\n\20\f\20\16\20\u0082")
22-
buf.write("\13\20\3\21\3\21\3\21\3\21\3\21\3\21\3\21\3\21\3\21\3")
23-
buf.write("\21\3\21\3\22\7\22\u0090\n\22\f\22\16\22\u0093\13\22\3")
24-
buf.write("\22\3\22\3\22\3\22\3\23\3\23\3\23\3\23\7\23\u009d\n\23")
25-
buf.write("\f\23\16\23\u00a0\13\23\3\23\3\23\3\24\3\24\7\24\u00a6")
26-
buf.write("\n\24\f\24\16\24\u00a9\13\24\3\24\3\24\3\24\3\24\3\25")
27-
buf.write("\6\25\u00b0\n\25\r\25\16\25\u00b1\3\25\3\25\3\26\6\26")
28-
buf.write("\u00b7\n\26\r\26\16\26\u00b8\3\26\3\26\6\u0080\u0091\u009e")
29-
buf.write("\u00a7\2\27\3\3\5\4\7\5\t\6\13\7\r\b\17\t\21\n\23\13\25")
30-
buf.write("\f\27\r\31\16\33\17\35\20\37\21!\22#\23%\24\'\25)\26+")
31-
buf.write("\27\3\2\7\3\2\62;\6\2\62;C\\aac|\3\2C\\\3\2\f\f\5\2\13")
32-
buf.write("\f\17\17\"\"\2\u00c7\2\3\3\2\2\2\2\5\3\2\2\2\2\7\3\2\2")
33-
buf.write("\2\2\t\3\2\2\2\2\13\3\2\2\2\2\r\3\2\2\2\2\17\3\2\2\2\2")
34-
buf.write("\21\3\2\2\2\2\23\3\2\2\2\2\25\3\2\2\2\2\27\3\2\2\2\2\31")
35-
buf.write("\3\2\2\2\2\33\3\2\2\2\2\35\3\2\2\2\2\37\3\2\2\2\2!\3\2")
36-
buf.write("\2\2\2#\3\2\2\2\2%\3\2\2\2\2\'\3\2\2\2\2)\3\2\2\2\2+\3")
37-
buf.write("\2\2\2\3-\3\2\2\2\5\62\3\2\2\2\7\65\3\2\2\2\t:\3\2\2\2")
38-
buf.write("\13=\3\2\2\2\rB\3\2\2\2\17H\3\2\2\2\21J\3\2\2\2\23O\3")
39-
buf.write("\2\2\2\25X\3\2\2\2\27Z\3\2\2\2\31`\3\2\2\2\33i\3\2\2\2")
40-
buf.write("\35x\3\2\2\2\37|\3\2\2\2!\u0083\3\2\2\2#\u0091\3\2\2\2")
41-
buf.write("%\u0098\3\2\2\2\'\u00a3\3\2\2\2)\u00af\3\2\2\2+\u00b6")
42-
buf.write("\3\2\2\2-.\7N\2\2./\7K\2\2/\60\7P\2\2\60\61\7M\2\2\61")
43-
buf.write("\4\3\2\2\2\62\63\7K\2\2\63\64\7H\2\2\64\6\3\2\2\2\65\66")
44-
buf.write("\7P\2\2\66\67\7Q\2\2\678\7F\2\289\7G\2\29\b\3\2\2\2:;")
45-
buf.write("\7C\2\2;<\7V\2\2<\n\3\2\2\2=>\7V\2\2>?\7K\2\2?@\7O\2\2")
46-
buf.write("@A\7G\2\2A\f\3\2\2\2BC\7\"\2\2CD\3\2\2\2DE\b\7\2\2E\16")
47-
buf.write("\3\2\2\2FI\5\21\t\2GI\5\23\n\2HF\3\2\2\2HG\3\2\2\2I\20")
48-
buf.write("\3\2\2\2JK\7Q\2\2KL\7R\2\2LM\7G\2\2MN\7P\2\2N\22\3\2\2")
49-
buf.write("\2OP\7E\2\2PQ\7N\2\2QR\7Q\2\2RS\7U\2\2ST\7G\2\2TU\7F\2")
50-
buf.write("\2U\24\3\2\2\2VY\5\27\f\2WY\5\31\r\2XV\3\2\2\2XW\3\2\2")
51-
buf.write("\2Y\26\3\2\2\2Z[\7D\2\2[\\\7G\2\2\\]\7N\2\2]^\7Q\2\2^")
52-
buf.write("_\7Y\2\2_\30\3\2\2\2`a\7C\2\2ab\7D\2\2bc\7Q\2\2cd\7X\2")
53-
buf.write("\2de\7G\2\2e\32\3\2\2\2fh\t\2\2\2gf\3\2\2\2hk\3\2\2\2")
54-
buf.write("ig\3\2\2\2ij\3\2\2\2jo\3\2\2\2ki\3\2\2\2ln\7\60\2\2ml")
55-
buf.write("\3\2\2\2nq\3\2\2\2om\3\2\2\2op\3\2\2\2ps\3\2\2\2qo\3\2")
56-
buf.write("\2\2rt\t\2\2\2sr\3\2\2\2tu\3\2\2\2us\3\2\2\2uv\3\2\2\2")
57-
buf.write("v\34\3\2\2\2wy\t\3\2\2xw\3\2\2\2yz\3\2\2\2zx\3\2\2\2z")
58-
buf.write("{\3\2\2\2{\36\3\2\2\2|\u0080\t\4\2\2}\177\13\2\2\2~}\3")
59-
buf.write("\2\2\2\177\u0082\3\2\2\2\u0080\u0081\3\2\2\2\u0080~\3")
60-
buf.write("\2\2\2\u0081 \3\2\2\2\u0082\u0080\3\2\2\2\u0083\u0084")
61-
buf.write("\7]\2\2\u0084\u0085\7E\2\2\u0085\u0086\7Q\2\2\u0086\u0087")
62-
buf.write("\7P\2\2\u0087\u0088\7V\2\2\u0088\u0089\7T\2\2\u0089\u008a")
63-
buf.write("\7Q\2\2\u008a\u008b\7N\2\2\u008b\u008c\7U\2\2\u008c\u008d")
64-
buf.write("\7_\2\2\u008d\"\3\2\2\2\u008e\u0090\13\2\2\2\u008f\u008e")
65-
buf.write("\3\2\2\2\u0090\u0093\3\2\2\2\u0091\u0092\3\2\2\2\u0091")
66-
buf.write("\u008f\3\2\2\2\u0092\u0094\3\2\2\2\u0093\u0091\3\2\2\2")
67-
buf.write("\u0094\u0095\5!\21\2\u0095\u0096\3\2\2\2\u0096\u0097\b")
68-
buf.write("\22\2\2\u0097$\3\2\2\2\u0098\u0099\7]\2\2\u0099\u009a")
69-
buf.write("\5\37\20\2\u009a\u009e\7_\2\2\u009b\u009d\13\2\2\2\u009c")
70-
buf.write("\u009b\3\2\2\2\u009d\u00a0\3\2\2\2\u009e\u009f\3\2\2\2")
71-
buf.write("\u009e\u009c\3\2\2\2\u009f\u00a1\3\2\2\2\u00a0\u009e\3")
72-
buf.write("\2\2\2\u00a1\u00a2\b\23\2\2\u00a2&\3\2\2\2\u00a3\u00a7")
73-
buf.write("\7=\2\2\u00a4\u00a6\13\2\2\2\u00a5\u00a4\3\2\2\2\u00a6")
74-
buf.write("\u00a9\3\2\2\2\u00a7\u00a8\3\2\2\2\u00a7\u00a5\3\2\2\2")
75-
buf.write("\u00a8\u00aa\3\2\2\2\u00a9\u00a7\3\2\2\2\u00aa\u00ab\5")
76-
buf.write(")\25\2\u00ab\u00ac\3\2\2\2\u00ac\u00ad\b\24\2\2\u00ad")
77-
buf.write("(\3\2\2\2\u00ae\u00b0\t\5\2\2\u00af\u00ae\3\2\2\2\u00b0")
78-
buf.write("\u00b1\3\2\2\2\u00b1\u00af\3\2\2\2\u00b1\u00b2\3\2\2\2")
79-
buf.write("\u00b2\u00b3\3\2\2\2\u00b3\u00b4\b\25\2\2\u00b4*\3\2\2")
80-
buf.write("\2\u00b5\u00b7\t\6\2\2\u00b6\u00b5\3\2\2\2\u00b7\u00b8")
81-
buf.write("\3\2\2\2\u00b8\u00b6\3\2\2\2\u00b8\u00b9\3\2\2\2\u00b9")
82-
buf.write("\u00ba\3\2\2\2\u00ba\u00bb\b\26\2\2\u00bb,\3\2\2\2\17")
83-
buf.write("\2HXiouz\u0080\u0091\u009e\u00a7\u00b1\u00b8\3\b\2\2")
17+
buf.write("\3\6\3\6\3\6\3\7\6\7D\n\7\r\7\16\7E\3\b\3\b\3\b\5\bK\n")
18+
buf.write("\b\3\t\3\t\3\t\3\t\3\t\3\n\3\n\3\n\3\n\3\n\3\n\3\n\3\13")
19+
buf.write("\3\13\5\13[\n\13\3\f\3\f\3\f\3\f\3\f\3\f\3\r\3\r\3\r\3")
20+
buf.write("\r\3\r\3\r\3\16\7\16j\n\16\f\16\16\16m\13\16\3\16\7\16")
21+
buf.write("p\n\16\f\16\16\16s\13\16\3\16\6\16v\n\16\r\16\16\16w\3")
22+
buf.write("\17\6\17{\n\17\r\17\16\17|\3\20\3\20\7\20\u0081\n\20\f")
23+
buf.write("\20\16\20\u0084\13\20\3\21\3\21\3\21\3\21\3\21\3\21\3")
24+
buf.write("\21\3\21\3\21\3\21\3\21\3\22\7\22\u0092\n\22\f\22\16\22")
25+
buf.write("\u0095\13\22\3\22\3\22\3\22\3\22\3\23\3\23\3\23\3\23\7")
26+
buf.write("\23\u009f\n\23\f\23\16\23\u00a2\13\23\3\23\3\23\3\24\3")
27+
buf.write("\24\7\24\u00a8\n\24\f\24\16\24\u00ab\13\24\3\24\3\24\3")
28+
buf.write("\24\3\24\3\25\6\25\u00b2\n\25\r\25\16\25\u00b3\3\25\3")
29+
buf.write("\25\3\26\6\26\u00b9\n\26\r\26\16\26\u00ba\3\26\3\26\6")
30+
buf.write("\u0082\u0093\u00a0\u00a9\2\27\3\3\5\4\7\5\t\6\13\7\r\b")
31+
buf.write("\17\t\21\n\23\13\25\f\27\r\31\16\33\17\35\20\37\21!\22")
32+
buf.write("#\23%\24\'\25)\26+\27\3\2\7\3\2\62;\6\2\62;C\\aac|\3\2")
33+
buf.write("C\\\3\2\f\f\5\2\13\f\17\17\"\"\2\u00cb\2\3\3\2\2\2\2\5")
34+
buf.write("\3\2\2\2\2\7\3\2\2\2\2\t\3\2\2\2\2\13\3\2\2\2\2\r\3\2")
35+
buf.write("\2\2\2\17\3\2\2\2\2\21\3\2\2\2\2\23\3\2\2\2\2\25\3\2\2")
36+
buf.write("\2\2\27\3\2\2\2\2\31\3\2\2\2\2\33\3\2\2\2\2\35\3\2\2\2")
37+
buf.write("\2\37\3\2\2\2\2!\3\2\2\2\2#\3\2\2\2\2%\3\2\2\2\2\'\3\2")
38+
buf.write("\2\2\2)\3\2\2\2\2+\3\2\2\2\3-\3\2\2\2\5\62\3\2\2\2\7\65")
39+
buf.write("\3\2\2\2\t:\3\2\2\2\13=\3\2\2\2\rC\3\2\2\2\17J\3\2\2\2")
40+
buf.write("\21L\3\2\2\2\23Q\3\2\2\2\25Z\3\2\2\2\27\\\3\2\2\2\31b")
41+
buf.write("\3\2\2\2\33k\3\2\2\2\35z\3\2\2\2\37~\3\2\2\2!\u0085\3")
42+
buf.write("\2\2\2#\u0093\3\2\2\2%\u009a\3\2\2\2\'\u00a5\3\2\2\2)")
43+
buf.write("\u00b1\3\2\2\2+\u00b8\3\2\2\2-.\7N\2\2./\7K\2\2/\60\7")
44+
buf.write("P\2\2\60\61\7M\2\2\61\4\3\2\2\2\62\63\7K\2\2\63\64\7H")
45+
buf.write("\2\2\64\6\3\2\2\2\65\66\7P\2\2\66\67\7Q\2\2\678\7F\2\2")
46+
buf.write("89\7G\2\29\b\3\2\2\2:;\7C\2\2;<\7V\2\2<\n\3\2\2\2=>\7")
47+
buf.write("V\2\2>?\7K\2\2?@\7O\2\2@A\7G\2\2A\f\3\2\2\2BD\7\"\2\2")
48+
buf.write("CB\3\2\2\2DE\3\2\2\2EC\3\2\2\2EF\3\2\2\2F\16\3\2\2\2G")
49+
buf.write("K\5\21\t\2HK\5\23\n\2IK\5\33\16\2JG\3\2\2\2JH\3\2\2\2")
50+
buf.write("JI\3\2\2\2K\20\3\2\2\2LM\7Q\2\2MN\7R\2\2NO\7G\2\2OP\7")
51+
buf.write("P\2\2P\22\3\2\2\2QR\7E\2\2RS\7N\2\2ST\7Q\2\2TU\7U\2\2")
52+
buf.write("UV\7G\2\2VW\7F\2\2W\24\3\2\2\2X[\5\27\f\2Y[\5\31\r\2Z")
53+
buf.write("X\3\2\2\2ZY\3\2\2\2[\26\3\2\2\2\\]\7D\2\2]^\7G\2\2^_\7")
54+
buf.write("N\2\2_`\7Q\2\2`a\7Y\2\2a\30\3\2\2\2bc\7C\2\2cd\7D\2\2")
55+
buf.write("de\7Q\2\2ef\7X\2\2fg\7G\2\2g\32\3\2\2\2hj\t\2\2\2ih\3")
56+
buf.write("\2\2\2jm\3\2\2\2ki\3\2\2\2kl\3\2\2\2lq\3\2\2\2mk\3\2\2")
57+
buf.write("\2np\7\60\2\2on\3\2\2\2ps\3\2\2\2qo\3\2\2\2qr\3\2\2\2")
58+
buf.write("ru\3\2\2\2sq\3\2\2\2tv\t\2\2\2ut\3\2\2\2vw\3\2\2\2wu\3")
59+
buf.write("\2\2\2wx\3\2\2\2x\34\3\2\2\2y{\t\3\2\2zy\3\2\2\2{|\3\2")
60+
buf.write("\2\2|z\3\2\2\2|}\3\2\2\2}\36\3\2\2\2~\u0082\t\4\2\2\177")
61+
buf.write("\u0081\13\2\2\2\u0080\177\3\2\2\2\u0081\u0084\3\2\2\2")
62+
buf.write("\u0082\u0083\3\2\2\2\u0082\u0080\3\2\2\2\u0083 \3\2\2")
63+
buf.write("\2\u0084\u0082\3\2\2\2\u0085\u0086\7]\2\2\u0086\u0087")
64+
buf.write("\7E\2\2\u0087\u0088\7Q\2\2\u0088\u0089\7P\2\2\u0089\u008a")
65+
buf.write("\7V\2\2\u008a\u008b\7T\2\2\u008b\u008c\7Q\2\2\u008c\u008d")
66+
buf.write("\7N\2\2\u008d\u008e\7U\2\2\u008e\u008f\7_\2\2\u008f\"")
67+
buf.write("\3\2\2\2\u0090\u0092\13\2\2\2\u0091\u0090\3\2\2\2\u0092")
68+
buf.write("\u0095\3\2\2\2\u0093\u0094\3\2\2\2\u0093\u0091\3\2\2\2")
69+
buf.write("\u0094\u0096\3\2\2\2\u0095\u0093\3\2\2\2\u0096\u0097\5")
70+
buf.write("!\21\2\u0097\u0098\3\2\2\2\u0098\u0099\b\22\2\2\u0099")
71+
buf.write("$\3\2\2\2\u009a\u009b\7]\2\2\u009b\u009c\5\37\20\2\u009c")
72+
buf.write("\u00a0\7_\2\2\u009d\u009f\13\2\2\2\u009e\u009d\3\2\2\2")
73+
buf.write("\u009f\u00a2\3\2\2\2\u00a0\u00a1\3\2\2\2\u00a0\u009e\3")
74+
buf.write("\2\2\2\u00a1\u00a3\3\2\2\2\u00a2\u00a0\3\2\2\2\u00a3\u00a4")
75+
buf.write("\b\23\2\2\u00a4&\3\2\2\2\u00a5\u00a9\7=\2\2\u00a6\u00a8")
76+
buf.write("\13\2\2\2\u00a7\u00a6\3\2\2\2\u00a8\u00ab\3\2\2\2\u00a9")
77+
buf.write("\u00aa\3\2\2\2\u00a9\u00a7\3\2\2\2\u00aa\u00ac\3\2\2\2")
78+
buf.write("\u00ab\u00a9\3\2\2\2\u00ac\u00ad\5)\25\2\u00ad\u00ae\3")
79+
buf.write("\2\2\2\u00ae\u00af\b\24\2\2\u00af(\3\2\2\2\u00b0\u00b2")
80+
buf.write("\t\5\2\2\u00b1\u00b0\3\2\2\2\u00b2\u00b3\3\2\2\2\u00b3")
81+
buf.write("\u00b1\3\2\2\2\u00b3\u00b4\3\2\2\2\u00b4\u00b5\3\2\2\2")
82+
buf.write("\u00b5\u00b6\b\25\2\2\u00b6*\3\2\2\2\u00b7\u00b9\t\6\2")
83+
buf.write("\2\u00b8\u00b7\3\2\2\2\u00b9\u00ba\3\2\2\2\u00ba\u00b8")
84+
buf.write("\3\2\2\2\u00ba\u00bb\3\2\2\2\u00bb\u00bc\3\2\2\2\u00bc")
85+
buf.write("\u00bd\b\26\2\2\u00bd,\3\2\2\2\20\2EJZkqw|\u0082\u0093")
86+
buf.write("\u00a0\u00a9\u00b3\u00ba\3\b\2\2")
8487
return buf.getvalue()
8588

8689

@@ -95,7 +98,7 @@ class controlsLexer(Lexer):
9598
T__2 = 3
9699
T__3 = 4
97100
T__4 = 5
98-
SPACES = 6
101+
ANY_SPACE = 6
99102
STATE = 7
100103
OPEN = 8
101104
CLOSED = 9
@@ -111,21 +114,22 @@ class controlsLexer(Lexer):
111114
COMMENT = 19
112115
NEWLINES = 20
113116
WS = 21
117+
#PUMP_SETTING = 22
114118

115119
channelNames = [ u"DEFAULT_TOKEN_CHANNEL", u"HIDDEN" ]
116120

117121
modeNames = [ "DEFAULT_MODE" ]
118122

119123
literalNames = [ "<INVALID>",
120-
"'LINK'", "'IF'", "'NODE'", "'AT'", "'TIME'", "' '", "'OPEN'",
121-
"'CLOSED'", "'BELOW'", "'ABOVE'", "'[CONTROLS]'" ]
124+
"'LINK'", "'IF'", "'NODE'", "'AT'", "'TIME'", "'OPEN'", "'CLOSED'",
125+
"'BELOW'", "'ABOVE'", "'[CONTROLS]'" ]
122126

123127
symbolicNames = [ "<INVALID>",
124-
"SPACES", "STATE", "OPEN", "CLOSED", "CONDITION", "BELOW", "ABOVE",
125-
"VALUE", "ID", "CAPITALS", "CONTROLS_HEADER", "PRECONTORLS",
128+
"ANY_SPACE", "STATE", "OPEN", "CLOSED", "CONDITION", "BELOW",
129+
"ABOVE", "VALUE", "ID", "CAPITALS", "CONTROLS_HEADER", "PRECONTORLS",
126130
"POSTCONTROLS", "COMMENT", "NEWLINES", "WS" ]
127131

128-
ruleNames = [ "T__0", "T__1", "T__2", "T__3", "T__4", "SPACES", "STATE",
132+
ruleNames = [ "T__0", "T__1", "T__2", "T__3", "T__4", "ANY_SPACE", "STATE",
129133
"OPEN", "CLOSED", "CONDITION", "BELOW", "ABOVE", "VALUE",
130134
"ID", "CAPITALS", "CONTROLS_HEADER", "PRECONTORLS", "POSTCONTROLS",
131135
"COMMENT", "NEWLINES", "WS" ]

0 commit comments

Comments
 (0)