|
 |
affdba |
diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c
|
|
|
affdba |
index e9af5f8..d994233 100644
|
|
|
affdba |
--- a/epan/dissectors/packet-tcp.c
|
|
|
affdba |
+++ b/epan/dissectors/packet-tcp.c
|
|
|
affdba |
@@ -1924,6 +1924,7 @@ again:
|
|
|
affdba |
* being a new higher-level PDU that also
|
|
|
affdba |
* needs desegmentation).
|
|
|
affdba |
*/
|
|
|
affdba |
+ remove_last_data_source(pinfo);
|
|
|
affdba |
fragment_set_partial_reassembly(&tcp_reassembly_table,
|
|
|
affdba |
pinfo, msp->first_frame, NULL);
|
|
|
affdba |
|
|
|
affdba |
diff --git a/epan/packet.c b/epan/packet.c
|
|
|
affdba |
index 44b953f..509fb22 100644
|
|
|
affdba |
--- a/epan/packet.c
|
|
|
affdba |
+++ b/epan/packet.c
|
|
|
affdba |
@@ -237,9 +237,24 @@ add_new_data_source(packet_info *pinfo, tvbuff_t *tvb, const char *name)
|
|
|
affdba |
src = (struct data_source *)g_malloc(sizeof(struct data_source));
|
|
|
affdba |
src->tvb = tvb;
|
|
|
affdba |
src->name = g_strdup(name);
|
|
|
affdba |
+ /* This could end up slow, but we should never have that many data
|
|
|
affdba |
+ * sources so it probably doesn't matter */
|
|
|
affdba |
pinfo->data_src = g_slist_append(pinfo->data_src, src);
|
|
|
affdba |
}
|
|
|
affdba |
|
|
|
affdba |
+void
|
|
|
affdba |
+remove_last_data_source(packet_info *pinfo)
|
|
|
affdba |
+{
|
|
|
affdba |
+ struct data_source *src;
|
|
|
affdba |
+ GSList *last;
|
|
|
affdba |
+
|
|
|
affdba |
+ last = g_slist_last(pinfo->data_src);
|
|
|
affdba |
+ src = (struct data_source *)last->data;
|
|
|
affdba |
+ pinfo->data_src = g_slist_delete_link(pinfo->data_src, last);
|
|
|
affdba |
+ g_free(src->name);
|
|
|
affdba |
+ g_slice_free(struct data_source, src);
|
|
|
affdba |
+}
|
|
|
affdba |
+
|
|
|
affdba |
const char*
|
|
|
affdba |
get_data_source_name(const struct data_source *src)
|
|
|
affdba |
{
|
|
|
affdba |
diff --git a/epan/packet.h b/epan/packet.h
|
|
|
affdba |
index e1a195b..f90199d 100644
|
|
|
affdba |
--- a/epan/packet.h
|
|
|
affdba |
+++ b/epan/packet.h
|
|
|
affdba |
@@ -408,6 +408,8 @@ final_registration_all_protocols(void);
|
|
|
affdba |
*/
|
|
|
affdba |
WS_DLL_PUBLIC void add_new_data_source(packet_info *pinfo, tvbuff_t *tvb,
|
|
|
affdba |
const char *name);
|
|
|
affdba |
+/* Removes the last-added data source, if it turns out it wasn't needed */
|
|
|
affdba |
+WS_DLL_PUBLIC void remove_last_data_source(packet_info *pinfo);
|
|
|
affdba |
|
|
|
affdba |
|
|
|
affdba |
/*
|