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

From Brad Hards: Jabber client-to-server protocol support. 

svn path=/trunk/; revision=7975
This commit is contained in:
Guy Harris 2003-07-07 22:48:55 +00:00
parent ecb79f8973
commit 19e0e3dc85
4 changed files with 148 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -1522,6 +1522,7 @@ Brad Hards <bhards[AT]bigpond.net.au> {
Initial rsync support
ACAP support
DISTCC support
Jabber client-to-server protocol support
}
cjs 2895 <cjs2895[AT]hotmail.com> {

3
Makefile.am
View File

@ -1,7 +1,7 @@
# Makefile.am
# Automake file for Ethereal
#
# $Id: Makefile.am,v 1.595 2003/06/26 18:21:29 guy Exp $
# $Id: Makefile.am,v 1.596 2003/07/07 22:48:54 guy Exp $
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
@ -254,6 +254,7 @@ DISSECTOR_SRC = \
packet-isns.c \
packet-isup.c \
packet-iua.c \
packet-jabber.c \
packet-kadm5.c \
packet-kerberos.c \
packet-klm.c \

3
Makefile.nmake
View File

@ -1,7 +1,7 @@
## Makefile for building ethereal.exe with Microsoft C and nmake
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
#
# $Id: Makefile.nmake,v 1.315 2003/06/25 13:42:18 deniel Exp $
# $Id: Makefile.nmake,v 1.316 2003/07/07 22:48:54 guy Exp $
include config.nmake
include <win32.mak>
@ -195,6 +195,7 @@ DISSECTOR_SRC = \
packet-isns.c \
packet-isup.c \
packet-iua.c \
packet-jabber.c \
packet-kadm5.c \
packet-kerberos.c \
packet-klm.c \

143
packet-jabber.c Normal file
View File

@ -0,0 +1,143 @@
/* packet-jabber.c
* Routines for Jabber packet dissection
* Copyright 2003, Brad Hards <bradh@frogmouth.net>
* Heavily based in packet-acap.c, which in turn is heavily based on
* packet-imap.c, Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
*
* $Id: packet-jabber.c,v 1.1 2003/07/07 22:48:55 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
*
* Copied from packet-acap.c
*
* 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 <stdio.h>
#include <string.h>
#include <glib.h>
#include <epan/packet.h>
#include <epan/strutil.h>
static int proto_jabber = -1;
static int hf_jabber_response = -1;
static int hf_jabber_request = -1;
static gint ett_jabber = -1;
static gint ett_jabber_reqresp = -1;
#define TCP_PORT_JABBER 5222
static void
dissect_jabber(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
gboolean is_request;
proto_tree *jabber_tree;
proto_item *ti;
gint offset = 0;
const guchar *line;
gint next_offset;
int linelen;
if (check_col(pinfo->cinfo, COL_PROTOCOL))
col_set_str(pinfo->cinfo, COL_PROTOCOL, "Jabber");
/*
* Find the end of the first line.
*
* Note that "tvb_find_line_end()" will return a value that is
* not longer than what's in the buffer, so the "tvb_get_ptr()"
* call won't throw an exception.
*/
linelen = tvb_find_line_end(tvb, offset, -1, &next_offset, FALSE);
line = tvb_get_ptr(tvb, offset, linelen);
if (pinfo->match_port == pinfo->destport)
is_request = TRUE;
else
is_request = FALSE;
if (check_col(pinfo->cinfo, COL_INFO)) {
/*
* Put the first line from the buffer into the summary
* (but leave out the line terminator).
*/
col_add_fstr(pinfo->cinfo, COL_INFO, "%s: %s",
is_request ? "Request" : "Response",
format_text(line, linelen));
}
if (tree) {
ti = proto_tree_add_item(tree, proto_jabber, tvb, offset, -1,
FALSE);
jabber_tree = proto_item_add_subtree(ti, ett_jabber);
if (is_request) {
proto_tree_add_boolean_hidden(jabber_tree,
hf_jabber_request, tvb, 0, 0, TRUE);
} else {
proto_tree_add_boolean_hidden(jabber_tree,
hf_jabber_response, tvb, 0, 0, TRUE);
}
/*
* Put the line into the protocol tree.
*/
ti = proto_tree_add_text(jabber_tree, tvb, offset,
next_offset - offset, "%s",
tvb_format_text(tvb, offset, next_offset - offset));
}
}
void
proto_register_jabber(void)
{
static hf_register_info hf[] = {
{ &hf_jabber_response,
{ "Response", "jabber.response",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
"TRUE if Jabber response", HFILL }},
{ &hf_jabber_request,
{ "Request", "jabber.request",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
"TRUE if Jabber request", HFILL }}
};
static gint *ett[] = {
&ett_jabber,
&ett_jabber_reqresp,
};
proto_jabber = proto_register_protocol("Jabber XML Messaging",
"Jabber", "jabber");
proto_register_field_array(proto_jabber, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
}
void
proto_reg_handoff_jabber(void)
{
dissector_handle_t jabber_handle;
jabber_handle = create_dissector_handle(dissect_jabber, proto_jabber);
dissector_add("tcp.port", TCP_PORT_JABBER, jabber_handle);
}