projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofp-msgs: Accept all versions of OpenFlow "hello" messages.
[openvswitch]
/
build-aux
/
extract-ofp-msgs
diff --git
a/build-aux/extract-ofp-msgs
b/build-aux/extract-ofp-msgs
index ad1a8a8327946b0951c2352cb13d7f854734b4b4..98072897584723e92f206cd3855241e026d89c8a 100755
(executable)
--- a/
build-aux/extract-ofp-msgs
+++ b/
build-aux/extract-ofp-msgs
@@
-29,7
+29,8
@@
version_map = {"1.0": (OFP10_VERSION, OFP10_VERSION),
"1.2+": (OFP12_VERSION, OFP13_VERSION),
"1.3+": (OFP13_VERSION, OFP13_VERSION),
"1.0-1.1": (OFP10_VERSION, OFP11_VERSION),
"1.2+": (OFP12_VERSION, OFP13_VERSION),
"1.3+": (OFP13_VERSION, OFP13_VERSION),
"1.0-1.1": (OFP10_VERSION, OFP11_VERSION),
- "1.0-1.2": (OFP10_VERSION, OFP12_VERSION)}
+ "1.0-1.2": (OFP10_VERSION, OFP12_VERSION),
+ "<all>": (0x01, 0xff)}
def get_line():
global line
def get_line():
global line
@@
-104,7
+105,7
@@
def extract_ofp_msgs(output_file_name):
comment += ' %s' % line.lstrip('* \t').rstrip(' \t\r\n')
comment = comment[:-2].rstrip()
comment += ' %s' % line.lstrip('* \t').rstrip(' \t\r\n')
comment = comment[:-2].rstrip()
- m = re.match(r'([A-Z]+) ([-.+\d]+) \((\d+)\): ([^.]+)\.$', comment)
+ m = re.match(r'([A-Z]+) ([-.+\d]+
|<all>
) \((\d+)\): ([^.]+)\.$', comment)
if not m:
fatal("unexpected syntax between messages")
type_, versions, number, contents = m.groups()
if not m:
fatal("unexpected syntax between messages")
type_, versions, number, contents = m.groups()