Adding upstream version 4.2.2.upstream/4.2.2

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 126 insertions, 0 deletions

diff --git a/epan/dissectors/packet-sipfrag.c b/epan/dissectors/packet-sipfrag.c
new file mode 100644
index 00000000..2e5f3918
--- /dev/null
+++ b/epan/dissectors/packet-sipfrag.c
@@ -0,0 +1,126 @@
+/* Routines for sipfrag packet disassembly (RFC 3420)
+ *
+ * Martin Mathieson
+ * Based on packet-sdp.c
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "config.h"
+
+#include <epan/packet.h>
+
+/*
+ * Doesn't do a detailed dissection of the lines of the message, just treat as text.
+ */
+
+void proto_register_sipfrag(void);
+
+/* Initialize the protocol and registered fields. */
+static int proto_sipfrag = -1;
+static int hf_sipfrag_line = -1;
+
+/* Protocol subtree. */
+static int ett_sipfrag = -1;
+
+void proto_reg_handoff_sipfrag(void);
+
+static dissector_handle_t sipfrag_handle;
+
+/* Main dissection function. */
+static int dissect_sipfrag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
+{
+    proto_tree  *sipfrag_tree;
+    proto_item  *ti;
+    gint        offset = 0;
+    gint        next_offset;
+    int         linelen;
+    char        *string;
+    gint        lines = 0;
+
+    /* Append this protocol name rather than replace. */
+    col_append_str(pinfo->cinfo, COL_PROTOCOL, "/sipfrag");
+
+    /* Add mention of this protocol to info column */
+    col_append_str(pinfo->cinfo, COL_INFO, ", with Sipfrag");
+
+    /* Create sipfrag tree. */
+    ti = proto_tree_add_item(tree, proto_sipfrag, tvb, offset, -1, ENC_NA);
+    sipfrag_tree = proto_item_add_subtree(ti, ett_sipfrag);
+
+    /* Show the sipfrag message a line at a time. */
+    while (tvb_offset_exists(tvb, offset))
+    {
+        /* Find the end of the line. */
+        linelen = tvb_find_line_end_unquoted(tvb, offset, -1, &next_offset);
+
+        /* For now, add all lines as unparsed strings */
+
+        /* Extract & add the string. */
+        string = (char*)tvb_get_string_enc(pinfo->pool, tvb, offset, linelen, ENC_ASCII);
+        proto_tree_add_string_format(sipfrag_tree, hf_sipfrag_line,
+                                     tvb, offset,
+                                     linelen, string,
+                                     "%s", string);
+        lines++;
+
+        /* Show first line in info column */
+        if (lines == 1) {
+            col_append_fstr(pinfo->cinfo, COL_INFO, "(%s", string);
+        }
+
+        /* Move onto next line. */
+        offset = next_offset;
+    }
+
+    /* Close off summary of sipfrag in info column */
+    col_append_str(pinfo->cinfo, COL_INFO, (lines > 1) ? "...)" : ")");
+    return tvb_captured_length(tvb);
+}
+
+void proto_register_sipfrag(void)
+{
+    static hf_register_info hf[] =
+    {
+        { &hf_sipfrag_line,
+            { "Line",
+              "sipfrag.line",FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL
+            }
+        },
+    };
+
+    static gint *ett[] =
+    {
+        &ett_sipfrag
+    };
+
+    /* Register protocol. */
+    proto_sipfrag = proto_register_protocol("Sipfrag", "SIPFRAG", "sipfrag");
+    proto_register_field_array(proto_sipfrag, hf, array_length(hf));
+    proto_register_subtree_array(ett, array_length(ett));
+
+    /* Allow other dissectors to find this one by name. */
+    sipfrag_handle = register_dissector("sipfrag", dissect_sipfrag, proto_sipfrag);
+}
+
+void proto_reg_handoff_sipfrag(void)
+{
+    dissector_add_string("media_type", "message/sipfrag", sipfrag_handle);
+}
+
+/*
+ * Editor modelines  -  https://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */