diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2009-06-18 21:30:42 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2009-06-18 21:30:42 +0000 |
| commit | b228488bc0b9d5e0c63b15814836f7332f35ce04 (patch) | |
| tree | 62ba2a1b91519fc94d9c3213b328889b969e0c78 /epan/dissectors/packet-msproxy.c | |
| parent | dec6ea57aefdcebc4bacd3934606ad0d78da446e (diff) | |
From Kovarththanan Rajaratnam via bug 3548:
(1) Trailing/leading spaces are removed from 'name's/'blurb's
(2) Duplicate 'blurb's are replaced with NULL
(3) Empty ("") 'blurb's are replaced with NULL
(4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields
for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME,
FT_PROTOCOL, FT_STRING and FT_STRINGZ field types
(5) Only allow non-zero value for 'display' if 'bitmask' is non-zero
svn path=/trunk/; revision=28770
Diffstat (limited to 'epan/dissectors/packet-msproxy.c')
| -rw-r--r-- | epan/dissectors/packet-msproxy.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/epan/dissectors/packet-msproxy.c b/epan/dissectors/packet-msproxy.c index ffdbcefc88..9d8c386d84 100644 --- a/epan/dissectors/packet-msproxy.c +++ b/epan/dissectors/packet-msproxy.c @@ -1155,87 +1155,87 @@ proto_register_msproxy( void){ { &hf_msproxy_cmd, { "Command", "msproxy.command", FT_UINT16, BASE_DEC, - NULL, 0x0, "", HFILL + NULL, 0x0, NULL, HFILL } }, { &hf_msproxy_dstaddr, { "Destination Address", "msproxy.dstaddr", FT_IPv4, BASE_NONE, NULL, - 0x0, "", HFILL + 0x0, NULL, HFILL } }, { &hf_msproxy_srcport, { "Source Port", "msproxy.srcport", FT_UINT16, - BASE_DEC, NULL, 0x0, "", HFILL + BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_msproxy_dstport, { "Destination Port", "msproxy.dstport", FT_UINT16, - BASE_DEC, NULL, 0x0, "", HFILL + BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_msproxy_clntport, { "Client Port", "msproxy.clntport", FT_UINT16, - BASE_DEC, NULL, 0x0, "", HFILL + BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_msproxy_server_ext_addr, { "Server External Address", "msproxy.server_ext_addr", FT_IPv4, BASE_NONE, NULL, - 0x0, "", HFILL + 0x0, NULL, HFILL } }, { &hf_msproxy_server_ext_port, { "Server External Port", "msproxy.server_ext_port", FT_UINT16, - BASE_DEC, NULL, 0x0, "", HFILL + BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_msproxy_server_int_addr, { "Server Internal Address", "msproxy.server_int_addr", FT_IPv4, BASE_NONE, NULL, - 0x0, "", HFILL + 0x0, NULL, HFILL } }, { &hf_msproxy_server_int_port, { "Server Internal Port", "msproxy.server_int_port", FT_UINT16, - BASE_DEC, NULL, 0x0, "", HFILL + BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_msproxy_serverport, { "Server Port", "msproxy.serverport", FT_UINT16, - BASE_DEC, NULL, 0x0, "", HFILL + BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_msproxy_bindport, { "Bind Port", "msproxy.bindport", FT_UINT16, - BASE_DEC, NULL, 0x0, "", HFILL + BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_msproxy_boundport, { "Bound Port", "msproxy.boundport", FT_UINT16, - BASE_DEC, NULL, 0x0, "", HFILL + BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_msproxy_serveraddr, { "Server Address", "msproxy.serveraddr", FT_IPv4, BASE_NONE, NULL, - 0x0, "", HFILL + 0x0, NULL, HFILL } }, { &hf_msproxy_bindaddr, { "Destination", "msproxy.bindaddr", FT_IPv4, BASE_NONE, NULL, - 0x0, "", HFILL + 0x0, NULL, HFILL } }, { &hf_msproxy_bind_id, { "Bound Port Id", "msproxy.bindid", FT_UINT32, - BASE_HEX, NULL, 0x0, "", HFILL + BASE_HEX, NULL, 0x0, NULL, HFILL } }, { &hf_msproxy_resolvaddr, { "Address", "msproxy.resolvaddr", FT_IPv4, BASE_NONE, NULL, - 0x0, "", HFILL + 0x0, NULL, HFILL } } |