diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-10-24 15:04:38 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-10-24 15:04:38 +0000 |
| commit | e4e536bf1d94f2ff31938ce28cabea3b827dc5f5 (patch) | |
| tree | d7736000d72974bae1cbc9607fe2e07454e21817 | |
| parent | eec2feb91e93ddd7d9bd54cfad017066a4e1c8cc (diff) | |
| download | wireshark-e4e536bf1d94f2ff31938ce28cabea3b827dc5f5.tar.gz | |
Remove need for match_port #define in packet_info.h and just replace existing calls.
svn path=/trunk/; revision=52815
| -rw-r--r-- | epan/dissectors/packet-elcom.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-epmd.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-ipp.c | 2 | ||||
| -rw-r--r-- | epan/packet_info.h | 3 |
4 files changed, 3 insertions, 6 deletions
diff --git a/epan/dissectors/packet-elcom.c b/epan/dissectors/packet-elcom.c index 794045d2a6..e0abe27635 100644 --- a/epan/dissectors/packet-elcom.c +++ b/epan/dissectors/packet-elcom.c @@ -426,7 +426,7 @@ dissect_elcom(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "ELCOM"); col_clear(pinfo->cinfo, COL_INFO); - is_request = (pinfo->match_port == pinfo->destport); + is_request = (pinfo->match_uint == pinfo->destport); elcom_len = tvb_get_ntohs(tvb, 0); length_ok = (tvb_reported_length(tvb) == (elcom_len+2)); diff --git a/epan/dissectors/packet-epmd.c b/epan/dissectors/packet-epmd.c index a8f94234f0..2f82762d2a 100644 --- a/epan/dissectors/packet-epmd.c +++ b/epan/dissectors/packet-epmd.c @@ -323,7 +323,7 @@ dissect_epmd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ ti = proto_tree_add_item(tree, proto_epmd, tvb, 0, -1, ENC_NA); epmd_tree = proto_item_add_subtree(ti, ett_epmd); - if (pinfo->match_port == pinfo->destport) { + if (pinfo->match_uint == pinfo->destport) { dissect_epmd_request(pinfo, tvb, 0, epmd_tree); } else { dissect_epmd_response(pinfo, tvb, 0, epmd_tree); diff --git a/epan/dissectors/packet-ipp.c b/epan/dissectors/packet-ipp.c index 97b7cc0fb7..482fc83aeb 100644 --- a/epan/dissectors/packet-ipp.c +++ b/epan/dissectors/packet-ipp.c @@ -182,7 +182,7 @@ dissect_ipp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *ipp_tree; proto_item *ti; int offset = 0; - gboolean is_request = (pinfo->destport == pinfo->match_port); + gboolean is_request = (pinfo->destport == pinfo->match_uint); /* XXX - should this be based on the HTTP header? */ guint16 status_code; const gchar *status_fmt; diff --git a/epan/packet_info.h b/epan/packet_info.h index c2b1b91135..8b0dac019e 100644 --- a/epan/packet_info.h +++ b/epan/packet_info.h @@ -228,9 +228,6 @@ typedef struct _packet_info { const gchar *pkt_comment; /**< NULL if not available */ } packet_info; -/**< For old code that hasn't yet been changed. */ -#define match_port match_uint - /** @} */ #endif /* __PACKET_INFO_H__ */ |