diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-11-15 18:47:06 -0500 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-11-16 13:46:07 +0000 |
| commit | d1696a6569033e1c8553aeecc940cfb7f64ebf64 (patch) | |
| tree | 9c6a83a2faae6785ecdc8b8083c8bb821645e81e /epan/dissectors/packet-isdn.c | |
| parent | f92ed4df2d4720720080d8013da124a0eb956de7 (diff) | |
"Bubble up" the use of pinfo->circuit_id and pinfo->ctype to make it more obvious where in used in hopes that it can be eliminated through passing dissector data (or methods other than using packet_info)
Change-Id: Ib0e7efc123a3f9c06f58b5579c3c25b18818205c
Reviewed-on: https://code.wireshark.org/review/5326
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-isdn.c')
| -rw-r--r-- | epan/dissectors/packet-isdn.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-isdn.c b/epan/dissectors/packet-isdn.c index 26d6af8fb5..a8f05c8279 100644 --- a/epan/dissectors/packet-isdn.c +++ b/epan/dissectors/packet-isdn.c @@ -111,6 +111,7 @@ dissect_isdn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "Network"); } + /* XXX - Are these still needed? We've used other values where necessary */ pinfo->ctype = CT_ISDN; pinfo->circuit_id = pinfo->pseudo_header->isdn.channel; @@ -125,10 +126,9 @@ dissect_isdn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* * Set up a circuit for this channel, and assign it a dissector. */ - circuit = find_circuit(pinfo->ctype, pinfo->circuit_id, pinfo->fd->num); + circuit = find_circuit(CT_ISDN, pinfo->pseudo_header->isdn.channel, pinfo->fd->num); if (circuit == NULL) - circuit = circuit_new(pinfo->ctype, pinfo->circuit_id, - pinfo->fd->num); + circuit = circuit_new(CT_ISDN, pinfo->pseudo_header->isdn.channel, pinfo->fd->num); if (circuit_get_dissector(circuit) == NULL) { /* @@ -199,7 +199,7 @@ dissect_isdn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } - if (!try_circuit_dissector(pinfo->ctype, pinfo->circuit_id, + if (!try_circuit_dissector(CT_ISDN, pinfo->pseudo_header->isdn.channel, pinfo->fd->num, tvb, pinfo, tree, NULL)) call_dissector(data_handle, tvb, pinfo, tree); } |