aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-x11.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2010-12-20 05:35:29 +0000
committerGuy Harris <guy@alum.mit.edu>2010-12-20 05:35:29 +0000
commita8bc4a0d136d7a68e8f006aec75a8e63191948c9 (patch)
tree2587cbb5c31f65afc60711d38d5dcc79a5a689e6 /epan/dissectors/packet-x11.c
parent7e16ec5b991b12020f7bdc135fd4943858bc3218 (diff)
Rename the routines that handle dissector tables with unsigned integer
keys to have _uint in their names, to match the routines that handle dissector tables with string keys. (Using _port can confuse people into thinking they're intended solely for use with TCP/UDP/etc. ports when, in fact, they work better for things such as Ethernet types, where the binding of particular values to particular protocols are a lot stronger.) svn path=/trunk/; revision=35224
Diffstat (limited to 'epan/dissectors/packet-x11.c')
-rw-r--r--epan/dissectors/packet-x11.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-x11.c b/epan/dissectors/packet-x11.c
index 02011927fd..1cebaa420d 100644
--- a/epan/dissectors/packet-x11.c
+++ b/epan/dissectors/packet-x11.c
@@ -2867,7 +2867,7 @@ guess_byte_ordering(tvbuff_t *tvb, packet_info *pinfo,
else if (state->byte_order == BYTE_ORDER_LE)
return TRUE; /* known to be little-endian */
- if (pinfo->srcport == pinfo->match_port) {
+ if (pinfo->srcport == pinfo->match_uint) {
/*
* This is a reply or event; we don't try to guess the
* byte order on it for now.
@@ -5583,7 +5583,7 @@ dissect_x11(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
col_set_str(pinfo->cinfo, COL_PROTOCOL, "X11");
- if (pinfo->match_port == pinfo->srcport)
+ if (pinfo->match_uint == pinfo->srcport)
dissect_x11_replies(tvb, pinfo, tree);
else
dissect_x11_requests(tvb, pinfo, tree);
@@ -5664,8 +5664,8 @@ proto_reg_handoff_x11(void)
dissector_handle_t x11_handle;
x11_handle = create_dissector_handle(dissect_x11, proto_x11);
- dissector_add("tcp.port", TCP_PORT_X11, x11_handle);
- dissector_add("tcp.port", TCP_PORT_X11_2, x11_handle);
- dissector_add("tcp.port", TCP_PORT_X11_3, x11_handle);
+ dissector_add_uint("tcp.port", TCP_PORT_X11, x11_handle);
+ dissector_add_uint("tcp.port", TCP_PORT_X11_2, x11_handle);
+ dissector_add_uint("tcp.port", TCP_PORT_X11_3, x11_handle);
}