X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=build-aux%2Fcheck-structs;h=f79f23513d7b6a236a7e29d8155f64d32fe25a7e;hb=8b8ef592521e32d0e32581bf39c5d2a5cd445977;hp=e50e3101164d872a993774ac49f82f9559aad514;hpb=cd03c7c85997b24070ee20c5995cefac47447e40;p=cascardo%2Fovs.git diff --git a/build-aux/check-structs b/build-aux/check-structs index e50e31011..f79f23513 100755 --- a/build-aux/check-structs +++ b/build-aux/check-structs @@ -15,12 +15,13 @@ types['ovs_be16'] = {"size": 2, "alignment": 2} types['ovs_be32'] = {"size": 4, "alignment": 4} types['ovs_be64'] = {"size": 8, "alignment": 8} types['ovs_32aligned_be64'] = {"size": 8, "alignment": 4} +types['struct eth_addr'] = {"size": 6, "alignment": 1} token = None line = "" idRe = "[a-zA-Z_][a-zA-Z_0-9]*" tokenRe = "#?" + idRe + "|[0-9]+|." -includeRe = re.compile(r'\s*#include\s+"(openflow/[^#]+)"') +includeRe = re.compile(r'\s*#include\s+<(openflow/[^#]+)>') includePath = '' inComment = False inDirective = False @@ -190,7 +191,7 @@ def parseStruct(): forceMatch(';') if size % alignment: shortage = alignment - (size % alignment) - if (structName == "struct ofp_packet_in" and + if (structName == "struct ofp10_packet_in" and shortage == 2 and memberName == 'data' and count == 0):