The interface name field is 6 bytes if we *do* have UUID information in
the file and 10 bytes if we *don't*. Small language edits in preference text and blurb. svn path=/trunk/; revision=12440
This commit is contained in:
parent
6c1c5fc3e7
commit
bbd6db0f46
|
@ -164,10 +164,10 @@ dissect_fw1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
||||||
chain[1] = 0;
|
chain[1] = 0;
|
||||||
|
|
||||||
if (!fw1_with_uuid) {
|
if (!fw1_with_uuid) {
|
||||||
tvb_get_nstringz0(tvb, 2, 6, interface_name);
|
tvb_get_nstringz0(tvb, 2, 10, interface_name);
|
||||||
uuid = 0;
|
uuid = 0;
|
||||||
} else {
|
} else {
|
||||||
tvb_get_nstringz0(tvb, 2, sizeof interface_name, interface_name);
|
tvb_get_nstringz0(tvb, 2, 6, interface_name);
|
||||||
uuid = tvb_get_ntohl(tvb, 8);
|
uuid = tvb_get_ntohl(tvb, 8);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -277,12 +277,12 @@ proto_register_fw1(void)
|
||||||
"Whether the FireWall-1 summary line should be shown in the protocol tree",
|
"Whether the FireWall-1 summary line should be shown in the protocol tree",
|
||||||
&fw1_summary_in_tree);
|
&fw1_summary_in_tree);
|
||||||
prefs_register_bool_preference(fw1_module, "with_uuid",
|
prefs_register_bool_preference(fw1_module, "with_uuid",
|
||||||
"fw monitor file includes UUID",
|
"Monitor file includes UUID",
|
||||||
"Whether the fw monitor file includes information of UUID",
|
"Whether the Firewall-1 monitor file includes UUID information",
|
||||||
&fw1_with_uuid);
|
&fw1_with_uuid);
|
||||||
prefs_register_bool_preference(fw1_module, "iflist_with_chain",
|
prefs_register_bool_preference(fw1_module, "iflist_with_chain",
|
||||||
"Interface list with chain position",
|
"Interface list includes chain position",
|
||||||
"Whether the interface list includes chain position",
|
"Whether the interface list includes the chain position",
|
||||||
&fw1_iflist_with_chain);
|
&fw1_iflist_with_chain);
|
||||||
|
|
||||||
register_dissector("fw1", dissect_fw1, proto_fw1);
|
register_dissector("fw1", dissect_fw1, proto_fw1);
|
||||||
|
|
Loading…
Reference in New Issue