diff options
| author | Michael Mann <mmann78@netscape.net> | 2017-11-11 17:16:13 -0500 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-11-13 05:21:36 +0000 |
| commit | 800b26edbe34e135cc9be1d4395db2c13ae1213f (patch) | |
| tree | fae0a8da631334bde17966a4e7a6a5c0f4491f71 /epan/dissectors/packet-fr.c | |
| parent | 7c40580584eac67a23633e58810028dddc58781c (diff) | |
Remove circuit API
Replace with conversation API that limits the "endpoint" to a single
uint32 value.
The intention is to eventually have "layered" endpoints, because circuit_id
was used in cases where src/dest port have already been populated (and
are used for layers above). Those src/dest ports should just be treated
as just another endpoint, but we currently only have support for one.
Change-Id: Ic6aa7ef0241275aa4dfde9459194369b48c72960
Reviewed-on: https://code.wireshark.org/review/24369
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-fr.c')
| -rw-r--r-- | epan/dissectors/packet-fr.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/epan/dissectors/packet-fr.c b/epan/dissectors/packet-fr.c index d35d0827b7..58cd2625bd 100644 --- a/epan/dissectors/packet-fr.c +++ b/epan/dissectors/packet-fr.c @@ -38,6 +38,7 @@ #include <epan/capture_dissectors.h> #include <epan/prefs.h> #include <epan/expert.h> +#include <epan/conversation.h> #include <wiretap/wtap.h> #include "packet-llc.h" @@ -507,9 +508,7 @@ dissect_fr_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_uint(fr_tree, hf_fr_dlci, tvb, 0, offset, addr); } - pinfo->ctype = CT_DLCI; - pinfo->circuit_id = addr; - + conversation_create_endpoint_by_id(pinfo, ENDPOINT_DLCI, addr, 0); col_add_fstr(pinfo->cinfo, COL_INFO, "DLCI %u", addr); } |