skinny: Resync xml code with dissector, regenerate
Make changes to packet-skinny.c.in and SkinnyProtocolOptimized.xml that incorporate changes from67f05835ca
and8efad466c4
made to the dissector manually and regenerate. Also fix a case where a comment mixed tabs and spaces, which caused the python conversion tool to complain.
This commit is contained in:
parent
8c585cc228
commit
73c291029d
|
@ -21,7 +21,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Generated Automatically Using (from wireshark base directory):
|
* Generated automatically Using (from wireshark base directory):
|
||||||
* cog.py -D xmlfile=tools/SkinnyProtocolOptimized.xml -d -c -o epan/dissectors/packet-skinny.c epan/dissectors/packet-skinny.c.in
|
* cog.py -D xmlfile=tools/SkinnyProtocolOptimized.xml -d -c -o epan/dissectors/packet-skinny.c epan/dissectors/packet-skinny.c.in
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@ -2251,7 +2251,7 @@ dissect_skinny_xml(ptvcursor_t *cursor, int hfindex, packet_info *pinfo, guint32
|
||||||
length = maxlength;
|
length = maxlength;
|
||||||
}
|
}
|
||||||
|
|
||||||
ptvcursor_add_no_advance(cursor, hfindex, length, ENC_ASCII|ENC_NA);
|
ptvcursor_add_no_advance(cursor, hfindex, length, ENC_ASCII);
|
||||||
|
|
||||||
item = proto_tree_add_item(tree, hf_skinny_xmlData, tvb, offset, length, ENC_ASCII);
|
item = proto_tree_add_item(tree, hf_skinny_xmlData, tvb, offset, length, ENC_ASCII);
|
||||||
subtree = proto_item_add_subtree(item, 0);
|
subtree = proto_item_add_subtree(item, 0);
|
||||||
|
@ -2337,7 +2337,7 @@ dissect_skinny_displayLabel(ptvcursor_t *cursor, packet_info *pinfo, int hfindex
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
item = proto_tree_add_item(tree, hfindex, tvb, offset, length, ENC_ASCII | ENC_NA);
|
item = proto_tree_add_item(tree, hfindex, tvb, offset, length, ENC_ASCII);
|
||||||
|
|
||||||
wmem_new = wmem_strbuf_sized_new(pinfo->pool, length + 1, 0);
|
wmem_new = wmem_strbuf_sized_new(pinfo->pool, length + 1, 0);
|
||||||
disp_string = (gchar*) wmem_alloc(pinfo->pool, length + 1);
|
disp_string = (gchar*) wmem_alloc(pinfo->pool, length + 1);
|
||||||
|
|
|
@ -210,7 +210,7 @@ dissect_skinny_xml(ptvcursor_t *cursor, int hfindex, packet_info *pinfo, guint32
|
||||||
length = maxlength;
|
length = maxlength;
|
||||||
}
|
}
|
||||||
|
|
||||||
ptvcursor_add_no_advance(cursor, hfindex, length, ENC_ASCII|ENC_NA);
|
ptvcursor_add_no_advance(cursor, hfindex, length, ENC_ASCII);
|
||||||
|
|
||||||
item = proto_tree_add_item(tree, hf_skinny_xmlData, tvb, offset, length, ENC_ASCII);
|
item = proto_tree_add_item(tree, hf_skinny_xmlData, tvb, offset, length, ENC_ASCII);
|
||||||
subtree = proto_item_add_subtree(item, 0);
|
subtree = proto_item_add_subtree(item, 0);
|
||||||
|
@ -296,7 +296,7 @@ dissect_skinny_displayLabel(ptvcursor_t *cursor, packet_info *pinfo, int hfindex
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
item = proto_tree_add_item(tree, hfindex, tvb, offset, length, ENC_ASCII | ENC_NA);
|
item = proto_tree_add_item(tree, hfindex, tvb, offset, length, ENC_ASCII);
|
||||||
|
|
||||||
wmem_new = wmem_strbuf_sized_new(pinfo->pool, length + 1, 0);
|
wmem_new = wmem_strbuf_sized_new(pinfo->pool, length + 1, 0);
|
||||||
disp_string = (gchar*) wmem_alloc(pinfo->pool, length + 1);
|
disp_string = (gchar*) wmem_alloc(pinfo->pool, length + 1);
|
||||||
|
@ -410,9 +410,9 @@ cog.out('static const skinny_opcode_map_t skinny_opcode_map[] = {\n')
|
||||||
for message in skinny.message:
|
for message in skinny.message:
|
||||||
msg_type = "SKINNY_MSGTYPE_EVENT"
|
msg_type = "SKINNY_MSGTYPE_EVENT"
|
||||||
if message.msgtype == "request":
|
if message.msgtype == "request":
|
||||||
msg_type = "SKINNY_MSGTYPE_REQUEST"
|
msg_type = "SKINNY_MSGTYPE_REQUEST"
|
||||||
if message.msgtype == "response" and message.request is not None:
|
if message.msgtype == "response" and message.request is not None:
|
||||||
msg_type = "SKINNY_MSGTYPE_RESPONSE"
|
msg_type = "SKINNY_MSGTYPE_RESPONSE"
|
||||||
cog.out(' {%-6s, %-47s, %-24s, "%s"},\n' %(message.opcode, message.gen_handler(), msg_type, message.name))
|
cog.out(' {%-6s, %-47s, %-24s, "%s"},\n' %(message.opcode, message.gen_handler(), msg_type, message.name))
|
||||||
cog.out('};\n')
|
cog.out('};\n')
|
||||||
]]]*/
|
]]]*/
|
||||||
|
|
|
@ -846,12 +846,12 @@
|
||||||
<fields endversion="17" fixed="yes">
|
<fields endversion="17" fixed="yes">
|
||||||
<string comment="" name="directoryNum" size="24" type="char"/>
|
<string comment="" name="directoryNum" size="24" type="char"/>
|
||||||
<integer comment="CallId" declare="yes" name="callReference" req_resp_key="1" type="uint32"/>
|
<integer comment="CallId" declare="yes" name="callReference" req_resp_key="1" type="uint32"/>
|
||||||
<enum comment="Stats Processing Mode" longcomment="What do do after you send the stats" name="statsProcessingMode" subtype="StatsProcessingType" type="uint32"/>
|
<enum comment="Stats Processing Mode" longcomment="What to do after you send the stats" name="statsProcessingMode" subtype="StatsProcessingType" type="uint32"/>
|
||||||
</fields>
|
</fields>
|
||||||
<fields beginversion="18" endversion="22" fixed="yes">
|
<fields beginversion="18" endversion="22" fixed="yes">
|
||||||
<string comment="" name="directoryNum" size="28" type="char"/>
|
<string comment="" name="directoryNum" size="28" type="char"/>
|
||||||
<integer comment="CallId" declare="yes" name="callReference" req_resp_key="1" type="uint32"/>
|
<integer comment="CallId" declare="yes" name="callReference" req_resp_key="1" type="uint32"/>
|
||||||
<integer comment="Stats Processing Mode" longcomment="What do do after you send the stats" name="statsProcessingMode" subtype="StatsProcessingType" type="uint8"/>
|
<integer comment="Stats Processing Mode" longcomment="What to do after you send the stats" name="statsProcessingMode" subtype="StatsProcessingType" type="uint8"/>
|
||||||
</fields>
|
</fields>
|
||||||
<fields>
|
<fields>
|
||||||
<integer comment="Number of Packets Sent" name="numberPacketsSent" type="uint32"/>
|
<integer comment="Number of Packets Sent" name="numberPacketsSent" type="uint32"/>
|
||||||
|
|
Loading…
Reference in New Issue