osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

From Martin Mathieson: SIP sipfrag support. 

svn path=/trunk/; revision=9969
This commit is contained in:
Guy Harris 2004-02-03 18:57:26 +00:00
parent ff0d9dd388
commit a7bb0c7e99
4 changed files with 147 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
AUTHORS
View File

@ -2013,6 +2013,10 @@ Sam Leffler <sam [AT] errno.com> {
5.2 and later and by NetBSD-current
}
Martin Mathieson <martin [AT] arca-technologies.com> {
SIP sipfrag support
}
And assorted fixes and enhancements by the people listed above and by:
Pavel Roskin <proski [AT] gnu.org>
@ -2037,7 +2041,6 @@ And assorted fixes and enhancements by the people listed above and by:
Steve Ford <sford [AT] geeky-boy.com>
Masaki Chikama <masaki-c [AT] is.aist-nara.ac.jp>
Mohammad Hanif <mhanif [AT] nexthop.com>
Martin Mathieson <martin [AT] arca-technologies.com>
Eric Wedel <ewedel [AT] bluearc.com>
Reinhard Speyerer <rspmn [AT] arcor.de>
Patrick Kursawe <phosphan [AT] gentoo.org>

3
Makefile.common
View File

@ -3,7 +3,7 @@
# a) common to both files and
# b) portable between both files
#
# $Id: Makefile.common,v 1.9 2004/02/01 10:31:17 jmayer Exp $
# $Id: Makefile.common,v 1.10 2004/02/03 18:57:26 guy Exp $
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
@ -355,6 +355,7 @@ DISSECTOR_SRC = \
packet-ses.c \
packet-sflow.c \
packet-sip.c \
packet-sipfrag.c \
packet-skinny.c \
packet-slimp3.c \
packet-sll.c \

2
doc/ethereal.pod
View File

@ -2084,6 +2084,7 @@ B<http://www.ethereal.com>.
Rolf Fiedler <Rolf.Fiedler [AT] Innoventif.com>
Alastair Maw <ethereal [AT] almaw.com>
Sam Leffler <sam [AT] errno.com>
Martin Mathieson <martin [AT] arca-technologies.com>
Pavel Roskin <proski [AT] gnu.org>
Georgi Guninski <guninski [AT] guninski.com>
Jason Copenhaver <jcopenha [AT] typedef.org>
@ -2106,7 +2107,6 @@ B<http://www.ethereal.com>.
Steve Ford <sford [AT] geeky-boy.com>
Masaki Chikama <masaki-c [AT] is.aist-nara.ac.jp>
Mohammad Hanif <mhanif [AT] nexthop.com>
Martin Mathieson <martin [AT] arca-technologies.com>
Eric Wedel <ewedel [AT] bluearc.com>
Reinhard Speyerer <rspmn [AT] arcor.de>
Patrick Kursawe <phosphan [AT] gentoo.org>

140
packet-sipfrag.c Normal file
View File

@ -0,0 +1,140 @@
/* Routines for sipfrag packet disassembly (RFC 3420)
*
* Martin Mathieson
* Based on packet-sdp.c
*
* $Id: packet-sipfrag.c,v 1.1 2004/02/03 18:57:26 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <epan/packet.h>
/*
* TODO:
* Doesn't currently dissect the lines of the message.
* Need to refactor SIP dissector and make its functionality available here
*/
/* Initialize the protocol and registered fields. */
static int proto_sipfrag = -1;
static int hf_line = -1;
/* Protocol subtree. */
static int ett_sipfrag = -1;
/* Main dissection function. */
static void
dissect_sipfrag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
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. */
if (check_col(pinfo->cinfo, COL_PROTOCOL))
col_append_str(pinfo->cinfo, COL_PROTOCOL, "/sipfrag");
/* Add mention of this protocol to info column */
if (check_col(pinfo->cinfo, COL_INFO)) {
col_append_str(pinfo->cinfo, COL_INFO, ", with Sipfrag");
}
/* Create sipfrag tree. */
ti = proto_tree_add_item(tree, proto_sipfrag, tvb, offset, -1, FALSE);
sipfrag_tree = proto_item_add_subtree(ti, ett_sipfrag);
/* Show the sipfrag message a line at a time. */
while (tvb_reported_length_remaining(tvb, offset) > 0)
{
/* 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 = tvb_get_string(tvb, offset, linelen);
proto_tree_add_string_format(sipfrag_tree, hf_line,
tvb, offset,
linelen, string,
"%s", string);
lines++;
/* Show first line in info column */
if (lines == 1 && check_col(pinfo->cinfo, COL_INFO)) {
col_append_fstr(pinfo->cinfo, COL_INFO, "(%s", string);
}
/* Finished with this string now. */
g_free(string);
/* Move onto next line. */
offset = next_offset;
}
/* Close off summary of sipfrag in info column */
if (check_col(pinfo->cinfo, COL_INFO)) {
col_append_str(pinfo->cinfo, COL_INFO, (lines > 1) ? "...)" : ")");
}
}
void
proto_register_sipfrag(void)
{
static hf_register_info hf[] =
{
{ &hf_line,
{ "Line",
"sipfrag.line",FT_STRING, BASE_NONE, NULL, 0x0, "Line", 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. */
register_dissector("sipfrag", dissect_sipfrag, proto_sipfrag);
}
void
proto_reg_handoff_sipfrag(void)
{
dissector_handle_t sipfrag_handle = find_dissector("sipfrag");
dissector_add_string("media_type", "message/sipfrag", sipfrag_handle);
}