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/packet_info.h | |
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/packet_info.h')
-rw-r--r-- | epan/packet_info.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/epan/packet_info.h b/epan/packet_info.h index ca8fca50d4..5a8a076c6e 100644 --- a/epan/packet_info.h +++ b/epan/packet_info.h @@ -71,9 +71,7 @@ typedef struct _packet_info { address net_dst; /**< network-layer destination address */ address src; /**< source address (net if present, DL otherwise )*/ address dst; /**< destination address (net if present, DL otherwise )*/ - guint32 vlan_id; /**< First encountered VLAN Id if pressent otherwise 0 */ - circuit_type ctype; /**< type of circuit, for protocols with a VC identifier */ - guint32 circuit_id; /**< circuit ID, for protocols with a VC identifier */ + guint32 vlan_id; /**< First encountered VLAN Id if present otherwise 0 */ const char *noreassembly_reason; /**< reason why reassembly wasn't done, if any */ gboolean fragmented; /**< TRUE if the protocol is only a fragment */ struct { |