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.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/packet.c')
| -rw-r--r-- | epan/packet.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/epan/packet.c b/epan/packet.c index e1a218d146..3904256d3c 100644 --- a/epan/packet.c +++ b/epan/packet.c @@ -325,9 +325,6 @@ init_dissection(void) /* Initialize the table of conversations. */ epan_conversation_init(); - /* Initialize the table of circuits. */ - epan_circuit_init(); - /* Initialize protocol-specific variables. */ g_slist_foreach(init_routines, &call_routine, NULL); @@ -341,9 +338,6 @@ init_dissection(void) void cleanup_dissection(void) { - /* Cleanup the table of circuits. */ - epan_circuit_cleanup(); - /* Cleanup protocol-specific variables. */ g_slist_foreach(cleanup_routines, &call_routine, NULL); @@ -540,7 +534,6 @@ dissect_record(epan_dissect_t *edt, int file_type_subtype, clear_address(&edt->pi.net_dst); clear_address(&edt->pi.src); clear_address(&edt->pi.dst); - edt->pi.ctype = CT_NONE; edt->pi.noreassembly_reason = ""; edt->pi.ptype = PT_NONE; edt->pi.use_endpoint = FALSE; @@ -608,7 +601,6 @@ dissect_file(epan_dissect_t *edt, struct wtap_pkthdr *phdr, clear_address(&edt->pi.net_dst); clear_address(&edt->pi.src); clear_address(&edt->pi.dst); - edt->pi.ctype = CT_NONE; edt->pi.noreassembly_reason = ""; edt->pi.ptype = PT_NONE; edt->pi.use_endpoint = FALSE; |