From a002a0fec41fdab23a6f247ea2b209bad0abefc8 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Tue, 14 Jan 2003 23:53:40 +0000 Subject: [PATCH] From Christian Falckenberg: beginnings of a MEGACO dissector. Move SCTP payload protocol IDs to a header file, and get the PPIDs from that header file rather than defining them in dissectors running atop SCTP. Use both the old(?) and official PPID for ASAP. svn path=/trunk/; revision=6926 --- AUTHORS | 4 + Makefile.am | 7 +- configure.in | 3 +- doc/ethereal.pod.template | 1 + packet-asap.c | 9 +- packet-iua.c | 8 +- packet-m2pa.c | 6 +- packet-m2tp.c | 6 +- packet-m2ua.c | 6 +- packet-m3ua.c | 6 +- packet-sctp.c | 19 +- packet-sua.c | 8 +- plugins/Makefile.am | 4 +- plugins/Makefile.nmake | 11 +- plugins/megaco/.cvsignore | 19 ++ plugins/megaco/AUTHORS | 3 + plugins/megaco/COPYING | 340 +++++++++++++++++++++++++++ plugins/megaco/ChangeLog | 0 plugins/megaco/INSTALL | 0 plugins/megaco/Makefile.am | 48 ++++ plugins/megaco/Makefile.nmake | 21 ++ plugins/megaco/NEWS | 0 plugins/megaco/moduleinfo.h | 16 ++ plugins/megaco/packet-megaco.c | 406 +++++++++++++++++++++++++++++++++ sctpppids.h | 53 +++++ 25 files changed, 958 insertions(+), 46 deletions(-) create mode 100644 plugins/megaco/.cvsignore create mode 100644 plugins/megaco/AUTHORS create mode 100644 plugins/megaco/COPYING create mode 100644 plugins/megaco/ChangeLog create mode 100644 plugins/megaco/INSTALL create mode 100644 plugins/megaco/Makefile.am create mode 100644 plugins/megaco/Makefile.nmake create mode 100644 plugins/megaco/NEWS create mode 100644 plugins/megaco/moduleinfo.h create mode 100644 plugins/megaco/packet-megaco.c create mode 100644 sctpppids.h diff --git a/AUTHORS b/AUTHORS index 95772c93f7..63b5acf1a8 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1568,6 +1568,10 @@ Anders Broman { Additional SCTP payload protocol identifiers } +Christian Falckenberg { + Initial MEGACO support +} + Alain Magloire was kind enough to give his permission to use his version of snprintf.c. diff --git a/Makefile.am b/Makefile.am index c7deb629c1..0facd14d95 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ # Makefile.am # Automake file for Ethereal # -# $Id: Makefile.am,v 1.537 2003/01/14 01:17:44 guy Exp $ +# $Id: Makefile.am,v 1.538 2003/01/14 23:53:32 guy Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs @@ -426,6 +426,7 @@ plugin_src = \ plugins/giop/packet-cosnaming.c \ plugins/giop/packet-coseventcomm.c \ plugins/gryphon/packet-gryphon.c \ + plugins/megaco/packet-megaco.c \ plugins/mgcp/packet-mgcp.c \ plugins/pcli/packet-pcli.c @@ -456,6 +457,7 @@ plugin_static_ldadd = \ plugins/giop/packet-cosnaming-static.o \ plugins/giop/packet-coseventcomm-static.o \ plugins/gryphon/packet-gryphon-static.o \ + plugins/megaco/packet-megaco-static.o \ plugins/mgcp/packet-mgcp-static.o \ plugins/pcli/packet-pcli-static.o @@ -464,6 +466,7 @@ plugin_libs = \ plugins/giop/cosnaming.la \ plugins/giop/coseventcomm.la \ plugins/gryphon/gryphon.la \ + plugins/megaco/megaco.la \ plugins/mgcp/mgcp.la \ plugins/pcli/pcli.la @@ -473,6 +476,7 @@ plugin_ldadd = \ "-dlopen" plugins/giop/cosnaming.la \ "-dlopen" plugins/giop/coseventcomm.la \ "-dlopen" plugins/gryphon/gryphon.la \ + "-dlopen" plugins/megaco/megaco.la \ "-dlopen" plugins/mgcp/mgcp.la \ "-dlopen" plugins/pcli/pcli.la else @@ -679,6 +683,7 @@ ETHEREAL_COMMON_SRC = \ ringbuffer.c \ ringbuffer.h \ rpc_defrag.h \ + sctpppids.h \ smb.h \ tap.c \ tap.h \ diff --git a/configure.in b/configure.in index a635a35536..aa6dc16e7b 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -# $Id: configure.in,v 1.191 2003/01/10 00:03:33 guy Exp $ +# $Id: configure.in,v 1.192 2003/01/14 23:53:32 guy Exp $ dnl dnl Process this file with autoconf 2.13 or later to produce a dnl configure script; 2.12 doesn't generate a "configure" script that @@ -761,6 +761,7 @@ AC_OUTPUT( plugins/docsis/Makefile plugins/giop/Makefile plugins/gryphon/Makefile + plugins/megaco/Makefile plugins/mgcp/Makefile plugins/pcli/Makefile tools/Makefile diff --git a/doc/ethereal.pod.template b/doc/ethereal.pod.template index dd558e697c..4e8179ea14 100644 --- a/doc/ethereal.pod.template +++ b/doc/ethereal.pod.template @@ -1684,6 +1684,7 @@ B. James Harris rmkml Anders Broman + Christian Falckenberg Alain Magloire was kind enough to give his permission to use his version of snprintf.c. diff --git a/packet-asap.c b/packet-asap.c index dd7fa04cf2..c90adc008b 100644 --- a/packet-asap.c +++ b/packet-asap.c @@ -6,7 +6,7 @@ * * Copyright 2002, Michael Tuexen * - * $Id: packet-asap.c,v 1.6 2002/11/28 03:57:49 guy Exp $ + * $Id: packet-asap.c,v 1.7 2003/01/14 23:53:32 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -34,8 +34,7 @@ #endif #include - -#define ASAP_PAYLOAD_PROTO_ID 4209948113u /* = 0xFAEEB5D1 */ +#include "sctpppids.h" /* Initialize the protocol and registered fields */ static int proto_asap = -1; @@ -844,5 +843,7 @@ proto_reg_handoff_asap(void) dissector_handle_t asap_handle; asap_handle = create_dissector_handle(dissect_asap, proto_asap); - dissector_add("sctp.ppi", ASAP_PAYLOAD_PROTO_ID, asap_handle); + dissector_add("sctp.ppi", ASAP_PAYLOAD_PROTOCOL_ID, asap_handle); + /* XXX - is 0xFAEEB5D1 still being used? */ + dissector_add("sctp.ppi", ASAP_OLD_PAYLOAD_PROTOCOL_ID, asap_handle); } diff --git a/packet-iua.c b/packet-iua.c index 926ddc19b9..6e3d279cfe 100644 --- a/packet-iua.c +++ b/packet-iua.c @@ -8,7 +8,7 @@ * * Copyright 2002, Michael Tuexen * - * $Id: packet-iua.c,v 1.18 2002/12/02 20:04:44 guy Exp $ + * $Id: packet-iua.c,v 1.19 2003/01/14 23:53:32 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -37,6 +37,7 @@ #include #include "prefs.h" +#include "sctpppids.h" #define NETWORK_BYTE_ORDER FALSE @@ -896,7 +897,6 @@ proto_register_iua(void) }; #define SCTP_PORT_IUA 9900 -#define IUA_PAYLOAD_PROTO_ID 1 void proto_reg_handoff_iua(void) @@ -906,6 +906,6 @@ proto_reg_handoff_iua(void) iua_handle = create_dissector_handle(dissect_iua, proto_iua); q931_handle = find_dissector("q931"); - dissector_add("sctp.port", SCTP_PORT_IUA, iua_handle); - dissector_add("sctp.ppi", IUA_PAYLOAD_PROTO_ID, iua_handle); + dissector_add("sctp.port", SCTP_PORT_IUA, iua_handle); + dissector_add("sctp.ppi", IUA_PAYLOAD_PROTOCOL_ID, iua_handle); } diff --git a/packet-m2pa.c b/packet-m2pa.c index 5f77a0b371..b8468598b4 100644 --- a/packet-m2pa.c +++ b/packet-m2pa.c @@ -7,7 +7,7 @@ * Copyright 2001, 2002, Jeff Morriss , * updated by Michael Tuexen * - * $Id: packet-m2pa.c,v 1.15 2002/11/09 19:00:09 tuexen Exp $ + * $Id: packet-m2pa.c,v 1.16 2003/01/14 23:53:32 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -37,10 +37,10 @@ #include #include "prefs.h" +#include "sctpppids.h" #define NETWORK_BYTE_ORDER FALSE #define SCTP_PORT_M2PA 3565 -#define M2PA_PAYLOAD_PROTOCOL_ID 5 static int global_sctp_port = SCTP_PORT_M2PA; static int sctp_port = 0; @@ -463,4 +463,4 @@ proto_reg_handoff_m2pa(void) sctp_port = global_sctp_port; dissector_add("sctp.port", sctp_port, m2pa_handle); -} \ No newline at end of file +} diff --git a/packet-m2tp.c b/packet-m2tp.c index 715e1a6248..d5678ef964 100644 --- a/packet-m2tp.c +++ b/packet-m2tp.c @@ -5,7 +5,7 @@ * * Copyright 2001, Heinz Prantner * - * $Id: packet-m2tp.c,v 1.5 2002/12/02 23:43:26 guy Exp $ + * $Id: packet-m2tp.c,v 1.6 2003/01/14 23:53:32 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -36,9 +36,9 @@ #include #include +#include "sctpppids.h" #define SCTP_PORT_M2TP 9908 /* unassigned port number (not assigned by IANA) */ -#define M2TP_PAYLOAD_PROTO_ID 99 /* s-link */ #define VERSION_LENGTH 1 #define RESERVED_LENGTH 1 @@ -678,6 +678,6 @@ proto_reg_handoff_m2tp(void) mtp2_handle = find_dissector("mtp2"); mtp2_proto_id = proto_get_id_by_filter_name("mtp2"); m2tp_handle = create_dissector_handle(dissect_m2tp, proto_m2tp); - dissector_add("sctp.ppi", M2TP_PAYLOAD_PROTO_ID, m2tp_handle); + dissector_add("sctp.ppi", M2TP_PAYLOAD_PROTOCOL_ID, m2tp_handle); dissector_add("sctp.port", SCTP_PORT_M2TP, m2tp_handle); } diff --git a/packet-m2ua.c b/packet-m2ua.c index 0f024702b3..0f43ece2eb 100644 --- a/packet-m2ua.c +++ b/packet-m2ua.c @@ -6,7 +6,7 @@ * * Copyright 2002, Michael Tuexen * - * $Id: packet-m2ua.c,v 1.7 2002/12/03 09:31:48 tuexen Exp $ + * $Id: packet-m2ua.c,v 1.8 2003/01/14 23:53:32 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -34,9 +34,9 @@ #endif #include +#include "sctpppids.h" #define SCTP_PORT_M2UA 2904 -#define M2UA_PAYLOAD_PROTO_ID 2 #define NETWORK_BYTE_ORDER FALSE @@ -1109,6 +1109,6 @@ proto_reg_handoff_m2ua(void) mtp3_handle = find_dissector("mtp3"); m2ua_handle = create_dissector_handle(dissect_m2ua, proto_m2ua); - dissector_add("sctp.ppi", M2UA_PAYLOAD_PROTO_ID, m2ua_handle); + dissector_add("sctp.ppi", M2UA_PAYLOAD_PROTOCOL_ID, m2ua_handle); dissector_add("sctp.port", SCTP_PORT_M2UA, m2ua_handle); } diff --git a/packet-m3ua.c b/packet-m3ua.c index 456e06a739..4c6bd2bdc6 100644 --- a/packet-m3ua.c +++ b/packet-m3ua.c @@ -9,7 +9,7 @@ * * Copyright 2000, 2001, 2002, Michael Tuexen * - * $Id: packet-m3ua.c,v 1.22 2002/12/02 23:43:27 guy Exp $ + * $Id: packet-m3ua.c,v 1.23 2003/01/14 23:53:32 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -45,9 +45,9 @@ #include #include "prefs.h" +#include "sctpppids.h" #define SCTP_PORT_M3UA 2905 -#define M3UA_PAYLOAD_PROTO_ID 3 #define VERSION_LENGTH 1 #define RESERVED_LENGTH 1 @@ -1885,6 +1885,6 @@ proto_reg_handoff_m3ua(void) mtp3_handle = find_dissector("mtp3"); data_handle = find_dissector("data"); m3ua_handle = create_dissector_handle(dissect_m3ua, proto_m3ua); - dissector_add("sctp.ppi", M3UA_PAYLOAD_PROTO_ID, m3ua_handle); + dissector_add("sctp.ppi", M3UA_PAYLOAD_PROTOCOL_ID, m3ua_handle); dissector_add("sctp.port", SCTP_PORT_M3UA, m3ua_handle); } diff --git a/packet-sctp.c b/packet-sctp.c index 9673b052c9..0d4a91028e 100644 --- a/packet-sctp.c +++ b/packet-sctp.c @@ -11,7 +11,7 @@ * - support for reassembly * - code cleanup * - * $Id: packet-sctp.c,v 1.47 2003/01/14 22:54:18 guy Exp $ + * $Id: packet-sctp.c,v 1.48 2003/01/14 23:53:33 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -41,6 +41,7 @@ #include "prefs.h" #include #include "ipproto.h" +#include "sctpppids.h" /* Initialize the protocol and registered fields */ static int proto_sctp = -1; @@ -302,21 +303,6 @@ static const value_string sctp_cause_code_values[] = { { ABORT_DUE_TO_ILLEGAL_ASCONF, "Association Aborted due to illegal ASCONF-ACK" }, { 0, NULL } }; -#define NOT_SPECIFIED_PROTOCOL_ID 0 -#define IUA_PAYLOAD_PROTOCOL_ID 1 -#define M2UA_PAYLOAD_PROTOCOL_ID 2 -#define M3UA_PAYLOAD_PROTOCOL_ID 3 -#define SUA_PAYLOAD_PROTOCOL_ID 4 -#define M2PA_PAYLOAD_PROTOCOL_ID 5 -#define V5UA_PAYLOAD_PROTOCOL_ID 6 -#define H248_PAYLOAD_PROTOCOL_ID 7 -#define BICC_PAYLOAD_PROTOCOL_ID 8 -#define TALI_PAYLOAD_PROTOCOL_ID 9 -#define DUA_PAYLOAD_PROTOCOL_ID 10 -#define ASAP_PAYLOAD_PROTOCOL_ID 11 -#define ENRP_PAYLOAD_PROTOCOL_ID 12 -#define H323_PAYLOAD_PROTOCOL_ID 13 - static const value_string sctp_payload_proto_id_values[] = { { NOT_SPECIFIED_PROTOCOL_ID, "not specified" }, { IUA_PAYLOAD_PROTOCOL_ID, "IUA" }, @@ -332,6 +318,7 @@ static const value_string sctp_payload_proto_id_values[] = { { ASAP_PAYLOAD_PROTOCOL_ID, "ASAP" }, { ENRP_PAYLOAD_PROTOCOL_ID, "ENRP" }, { H323_PAYLOAD_PROTOCOL_ID, "H.323" }, + { ASAP_PAYLOAD_PROTOCOL_ID, "ASAP" }, { 0, NULL } }; /* The structure of the common header is described by the following constants */ diff --git a/packet-sua.c b/packet-sua.c index f815ab1698..9ec9dba1f4 100644 --- a/packet-sua.c +++ b/packet-sua.c @@ -6,7 +6,7 @@ * * Copyright 2000, Michael Tüxen * - * $Id: packet-sua.c,v 1.11 2002/12/02 23:43:29 guy Exp $ + * $Id: packet-sua.c,v 1.12 2003/01/14 23:53:33 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -42,9 +42,9 @@ #include #include "prefs.h" +#include "sctpppids.h" #define SCTP_PORT_SUA 14001 -#define SUA_PAYLOAD_PROTO_ID 4 #define RESERVED_1_LENGTH 1 #define RESERVED_2_LENGTH 2 @@ -2750,6 +2750,6 @@ proto_reg_handoff_sua(void) dissector_handle_t sua_handle; sua_handle = create_dissector_handle(dissect_sua, proto_sua); - dissector_add("sctp.ppi", SUA_PAYLOAD_PROTO_ID, sua_handle); - dissector_add("sctp.port", SCTP_PORT_SUA, sua_handle); + dissector_add("sctp.ppi", SUA_PAYLOAD_PROTOCOL_ID, sua_handle); + dissector_add("sctp.port", SCTP_PORT_SUA, sua_handle); } diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 8e67efd89c..058097e9a1 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -1,7 +1,7 @@ # Makefile.am # Automake file for Ethereal # -# $Id: Makefile.am,v 1.12 2002/10/03 02:56:57 hagbard Exp $ +# $Id: Makefile.am,v 1.13 2003/01/14 23:53:38 guy Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs @@ -21,7 +21,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -SUBDIRS = docsis giop gryphon mgcp pcli +SUBDIRS = docsis giop gryphon megaco mgcp pcli plugindir = @plugindir@ diff --git a/plugins/Makefile.nmake b/plugins/Makefile.nmake index eb8f1b2c5a..a6184a1975 100644 --- a/plugins/Makefile.nmake +++ b/plugins/Makefile.nmake @@ -1,5 +1,5 @@ # -# $Id: Makefile.nmake,v 1.15 2002/10/03 02:56:57 hagbard Exp $ +# $Id: Makefile.nmake,v 1.16 2003/01/14 23:53:38 guy Exp $ # include ..\config.nmake @@ -13,7 +13,7 @@ CFLAGS=/DHAVE_CONFIG_H /I.. /I../wiretap /I. \ OBJECTS=plugin_api.obj -all: plugin_api.obj docsis giop gryphon mgcp pcli +all: plugin_api.obj docsis giop gryphon megaco mgcp pcli docsis:: cd docsis @@ -30,6 +30,11 @@ gryphon:: $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake cd .. +megaco:: + cd megaco + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake + cd .. + mgcp:: cd mgcp $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake @@ -48,6 +53,8 @@ clean: $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean cd ../gryphon $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean + cd ../megaco + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean cd ../mgcp $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean cd ../pcli diff --git a/plugins/megaco/.cvsignore b/plugins/megaco/.cvsignore new file mode 100644 index 0000000000..94009a655e --- /dev/null +++ b/plugins/megaco/.cvsignore @@ -0,0 +1,19 @@ +.deps +.libs +Makefile +Makefile.in +config.cache +config.h +config.h.in +config.log +config.status +configure +megaco.la +packet-megaco.lo +packet-megaco-static.lo +stamp-h +*.obj +*.dll +*.exp +*.lib +*.pdb diff --git a/plugins/megaco/AUTHORS b/plugins/megaco/AUTHORS new file mode 100644 index 0000000000..6737b0c5c8 --- /dev/null +++ b/plugins/megaco/AUTHORS @@ -0,0 +1,3 @@ +Author: +Christian Falckenberg + diff --git a/plugins/megaco/COPYING b/plugins/megaco/COPYING new file mode 100644 index 0000000000..d60c31a97a --- /dev/null +++ b/plugins/megaco/COPYING @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (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 + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/plugins/megaco/ChangeLog b/plugins/megaco/ChangeLog new file mode 100644 index 0000000000..e69de29bb2 diff --git a/plugins/megaco/INSTALL b/plugins/megaco/INSTALL new file mode 100644 index 0000000000..e69de29bb2 diff --git a/plugins/megaco/Makefile.am b/plugins/megaco/Makefile.am new file mode 100644 index 0000000000..d7465c8bed --- /dev/null +++ b/plugins/megaco/Makefile.am @@ -0,0 +1,48 @@ +# Makefile.am +# Automake file for Megaco Ethereal plugin +# +# $Id: Makefile.am,v 1.1 2003/01/14 23:53:40 guy Exp $ +# +# Ethereal - Network traffic analyzer +# By Gerald Combs +# 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. +# + +INCLUDES = -I$(top_srcdir) + +plugindir = @plugindir@ + +plugin_LTLIBRARIES = megaco.la +megaco_la_SOURCES = packet-megaco.c moduleinfo.h +megaco_la_LDFLAGS = -module -avoid-version + +# Libs must be cleared, or else libtool won't create a shared module. +# If your module needs to be linked against any particular libraries, +# add them here. +LIBS = + +megaco_la_DEPENDENCIES = packet-megaco-static.o + +packet-megaco-static.o: packet-megaco.c moduleinfo.h + $(LTCOMPILE) -c -o packet-megaco-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-megaco.c + +CLEANFILES = \ + megaco \ + *~ + +EXTRA_DIST = \ + Makefile.nmake diff --git a/plugins/megaco/Makefile.nmake b/plugins/megaco/Makefile.nmake new file mode 100644 index 0000000000..068a880e0f --- /dev/null +++ b/plugins/megaco/Makefile.nmake @@ -0,0 +1,21 @@ +# +# $Id: Makefile.nmake,v 1.1 2003/01/14 23:53:40 guy Exp $ +# + +include ..\..\config.nmake + +############### no need to modify below this line ######### + +CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap \ + /I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \ + /I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \ + /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) + +OBJECTS=packet-megaco.obj + +megaco.dll megaco.exp megaco.lib : packet-megaco.obj ..\plugin_api.obj + link -dll /out:megaco.dll packet-megaco.obj ..\plugin_api.obj \ + $(GLIB_DIR)\glib-$(GLIB_VERSION).lib + +clean: + rm -f $(OBJECTS) megaco.dll megaco.exp megaco.lib $(PDB_FILE) diff --git a/plugins/megaco/NEWS b/plugins/megaco/NEWS new file mode 100644 index 0000000000..e69de29bb2 diff --git a/plugins/megaco/moduleinfo.h b/plugins/megaco/moduleinfo.h new file mode 100644 index 0000000000..0bc684f1a3 --- /dev/null +++ b/plugins/megaco/moduleinfo.h @@ -0,0 +1,16 @@ +/* Included *after* config.h, in order to re-define these macros */ + +#ifdef PACKAGE +#undef PACKAGE +#endif + +/* Name of package */ +#define PACKAGE "megaco" + +#ifdef VERSION +#undef VERSION +#endif + +/* Version number of package */ +#define VERSION "0.0.1" + diff --git a/plugins/megaco/packet-megaco.c b/plugins/megaco/packet-megaco.c new file mode 100644 index 0000000000..00e98ed205 --- /dev/null +++ b/plugins/megaco/packet-megaco.c @@ -0,0 +1,406 @@ +/* packet-megaco.c + * Routines for megaco packet disassembly + * RFC 3015 + * + * Christian Falckenberg, 2002/10/17 + * Copyright (c) 2002 by Christian Falckenberg + * + * + * Ethereal - Network traffic analyzer + * By Gerald Combs + * Copyright 1999 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 "plugins/plugin_api.h" + +#include "moduleinfo.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include "prefs.h" +#include +#include "sctpppids.h" + +#include "plugins/plugin_api_defs.h" + +#ifndef __ETHEREAL_STATIC__ +G_MODULE_EXPORT const gchar version[] = VERSION; +#endif + +#define PORT_MEGACO_TXT 2944 +#define PORT_MEGACO_BIN 2945 + +void proto_reg_handoff_megaco(void); + +/* Define the megaco proto */ +static int proto_megaco = -1; + +/* Define headers for megaco */ +static int hf_megaco_version = -1; +static int hf_megaco_mid = -1; +static int hf_megaco_transaction = -1; +static int hf_megaco_transid = -1; + +/* Define the tree for megaco */ +static int ett_megaco = -1; + +/* + * Here are the global variables associated with + * the various user definable characteristics of the dissection + * + * MEGACO has two kinds of message formats: text and binary + * + * global_megaco_raw_text determines whether we are going to display + * the raw text of the megaco message, much like the HTTP dissector does. + * + * global_megaco_dissect_tree determines whether we are going to display + * a detailed tree that expresses a somewhat more semantically meaningful + * decode. + */ +static int global_megaco_txt_tcp_port = PORT_MEGACO_TXT; +static int global_megaco_txt_udp_port = PORT_MEGACO_TXT; +static int global_megaco_bin_tcp_port = PORT_MEGACO_BIN; +static int global_megaco_bin_udp_port = PORT_MEGACO_BIN; +static gboolean global_megaco_raw_text = TRUE; +static gboolean global_megaco_dissect_tree = TRUE; + +/* + * Variables to allow for proper deletion of dissector registration when + * the user changes port from the gui. + */ +static int txt_tcp_port = 0; +static int txt_udp_port = 0; +static int bin_tcp_port = 0; +static int bin_udp_port = 0; + +/* Some basic utility functions that are specific to this dissector */ +static gint tvb_skip_wsp(tvbuff_t* tvb, gint offset, gint maxlength); + +/* + * The various functions that either dissect some + * subpart of MEGACO. These aren't really proto dissectors but they + * are written in the same style. + */ +static void megaco_raw_text_add(tvbuff_t *tvb, + proto_tree *tree); + +/* + * dissect_megaco - The dissector for the MEGACO Protocol + */ + +static void +dissect_megaco(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + gint tvb_len, len; + gint tvb_offset,tvb_current_offset,tvb_previous_offset, tokenlen; + proto_tree *megaco_tree, *ti; + proto_item* (*my_proto_tree_add_string)(proto_tree*, int, tvbuff_t*, gint, + gint, const char*); + guint8 word[7]; + gint tvb_linebegin,tvb_lineend,linelen; + + /* Initialize variables */ + tvb_len = tvb_length(tvb); + megaco_tree = NULL; + ti = NULL; + tvb_previous_offset = 0; + tvb_current_offset = 0; + + /* + * Check to see whether we're really dealing with MEGACO by looking + * for the MEGACO string. This needs to be improved when supporting + * binary encodings. + */ + if(!tvb_get_nstringz0(tvb,0,6,word)) return; + if (strncasecmp(word, "MEGACO", 6) != 0) return; + + /* Display MEGACO in protocol column */ + if (check_col(pinfo->cinfo, COL_PROTOCOL)) + col_add_str(pinfo->cinfo, COL_PROTOCOL, "MEGACO"); + + /* Display transaction in info column */ + tvb_offset = tvb_find_guint8(tvb, 0, tvb_len, ' '); + tvb_offset = tvb_find_guint8(tvb, tvb_offset, tvb_len, ' '); + len = tvb_find_guint8(tvb, tvb_offset, tvb_len, '=') - tvb_offset; + + if (check_col(pinfo->cinfo, COL_INFO) ) + col_add_fstr(pinfo->cinfo, COL_INFO, "%s", + tvb_format_text(tvb,tvb_offset,len)); + + /* Build the info tree if we've been given a root */ + if (tree) + { + /* Create megaco subtree */ + ti = proto_tree_add_item(tree,proto_megaco,tvb,0,0, FALSE); + megaco_tree = proto_item_add_subtree(ti, ett_megaco); + + if(global_megaco_dissect_tree) + my_proto_tree_add_string = proto_tree_add_string; + else + my_proto_tree_add_string = proto_tree_add_string_hidden; + + /* Find version */ + + tvb_previous_offset = tvb_find_guint8(tvb, tvb_previous_offset, + tvb_len, '/') + 1; + tvb_current_offset = tvb_find_guint8(tvb, tvb_previous_offset, + tvb_len, ' '); + + tokenlen = tvb_current_offset - tvb_previous_offset; + + if (tree) + my_proto_tree_add_string(megaco_tree, hf_megaco_version, tvb, + tvb_previous_offset, tokenlen, + tvb_format_text(tvb, tvb_previous_offset, + tokenlen)); + + + /* Find mId (message originator identifier) */ + tvb_previous_offset = tvb_skip_wsp(tvb, tvb_current_offset, + tvb_len); + tvb_current_offset = tvb_find_guint8(tvb, tvb_previous_offset, + tvb_len, ' '); + + tokenlen = tvb_current_offset - tvb_previous_offset; + + my_proto_tree_add_string(megaco_tree, hf_megaco_mid, tvb, + tvb_previous_offset, tokenlen, + tvb_format_text(tvb, tvb_previous_offset, + tokenlen)); + /* Find transaction */ + tvb_previous_offset = tvb_skip_wsp(tvb, tvb_current_offset, + tvb_len); + tvb_current_offset = tvb_find_guint8(tvb, tvb_previous_offset, + tvb_len, '='); + + tokenlen = tvb_current_offset - tvb_previous_offset; + + my_proto_tree_add_string(megaco_tree, hf_megaco_transaction, tvb, + tvb_previous_offset, tokenlen, + tvb_format_text(tvb, tvb_previous_offset, + tokenlen)); + if (check_col(pinfo->cinfo, COL_INFO) ) + col_add_fstr(pinfo->cinfo, COL_INFO, "%s", + tvb_format_text(tvb,tvb_previous_offset,tokenlen)); + + /* Find transaction id */ + tvb_previous_offset = tvb_skip_wsp(tvb, tvb_current_offset, + tvb_len) + 1; + tvb_current_offset = tvb_find_guint8(tvb, tvb_previous_offset, + tvb_len, '{'); + + tokenlen = tvb_current_offset - tvb_previous_offset; + + my_proto_tree_add_string(megaco_tree, hf_megaco_transid, tvb, + tvb_previous_offset, tokenlen, + tvb_format_text(tvb, tvb_previous_offset, + tokenlen)); + + /* and finally the whole message as raw text */ + + if(global_megaco_raw_text){ + tvb_linebegin = 0; + + do { + tvb_find_line_end(tvb,tvb_linebegin,-1,&tvb_lineend,FALSE); + linelen = tvb_lineend - tvb_linebegin; + proto_tree_add_text(tree, tvb, tvb_linebegin, linelen, + "%s", tvb_format_text(tvb,tvb_linebegin, + linelen)); + tvb_linebegin = tvb_lineend; + } while ( tvb_lineend < tvb_len ); + } + } +} + +/* Register all the bits needed with the filtering engine */ + +void +proto_register_megaco(void) +{ + static hf_register_info hf[] = { + { &hf_megaco_version, + { "Version", "megaco.version", FT_STRING, BASE_DEC, NULL, 0x0, + "MEGACO Version", HFILL }}, + { &hf_megaco_mid, + { "mID", "megaco.mid", FT_STRING, BASE_DEC, NULL, 0x0, + "Message Originator", HFILL }}, + { &hf_megaco_transaction, + { "Transaction", "megaco.transaction", FT_STRING, BASE_DEC, NULL, 0x0, + "Transaction type of this message", HFILL }}, + { &hf_megaco_transid, + { "Transaction ID", "megaco.transid", FT_STRING, BASE_DEC, NULL, 0x0, + "Transaction ID of this message", HFILL }}, + /* Add more fields here */ + }; + static gint *ett[] = { + &ett_megaco, + }; + module_t *megaco_module; + + proto_megaco = proto_register_protocol("MEGACO", + "MEGACO", "megaco"); + + proto_register_field_array(proto_megaco, hf, array_length(hf)); + proto_register_subtree_array(ett, array_length(ett)); + + /* Register our configuration options, particularly our ports */ + + megaco_module = prefs_register_protocol(proto_megaco, proto_reg_handoff_megaco); + + prefs_register_uint_preference(megaco_module, "tcp.txt_port", + "MEGACO TXT TCP Port", + "Set the TCP port for MEGACO txt messages ", + 10, &global_megaco_txt_tcp_port); + + prefs_register_uint_preference(megaco_module, "udp.txt_port", + "MEGACO TXT UDP Port", + "Set the UDP port for gateway messages ", + 10, &global_megaco_txt_udp_port); + + prefs_register_uint_preference(megaco_module, "tcp.bin_port", + "MEGACO bin TCP Port", + "Set the TCP port for MEGACO binary messages ", + 10, &global_megaco_bin_tcp_port); + + prefs_register_uint_preference(megaco_module, "udp.bin_port", + "MEGACO Callagent UDP Port", + "Set the UDP port for callagent messages " + "(if other than the default of 2727)", + 10, &global_megaco_bin_udp_port); + + + prefs_register_bool_preference(megaco_module, "display_raw_text", + "Display raw text for MEGACO message", + "Specifies that the raw text of the " + "MEGACO message should be displayed " + "instead of (or in addition to) the " + "dissection tree", + &global_megaco_raw_text); + + prefs_register_bool_preference(megaco_module, "display_dissect_tree", + "Display tree dissection for MEGACO message", + "Specifies that the dissection tree of the " + "MEGACO message should be displayed " + "instead of (or in addition to) the " + "raw text", + &global_megaco_dissect_tree); +} + +/* The registration hand-off routine */ +void +proto_reg_handoff_megaco(void) +{ + static int megaco_prefs_initialized = FALSE; + static dissector_handle_t megaco_handle; + + /* + * Get a handle for the SDP dissector. + */ + if (!megaco_prefs_initialized) { + megaco_handle = create_dissector_handle(dissect_megaco, proto_megaco); + megaco_prefs_initialized = TRUE; + } + else { + dissector_delete("tcp.port", txt_tcp_port, megaco_handle); + dissector_delete("udp.port", txt_udp_port, megaco_handle); + dissector_delete("tcp.port", bin_tcp_port, megaco_handle); + dissector_delete("udp.port", bin_udp_port, megaco_handle); + } + + /* Set our port number for future use */ + + txt_tcp_port = global_megaco_txt_tcp_port; + txt_udp_port = global_megaco_txt_udp_port; + + bin_tcp_port = global_megaco_bin_tcp_port; + bin_udp_port = global_megaco_bin_udp_port; + + dissector_add("tcp.port", global_megaco_txt_tcp_port, megaco_handle); + dissector_add("udp.port", global_megaco_txt_udp_port, megaco_handle); + dissector_add("tcp.port", global_megaco_bin_tcp_port, megaco_handle); + dissector_add("udp.port", global_megaco_bin_udp_port, megaco_handle); + dissector_add("sctp.ppi", H248_PAYLOAD_PROTOCOL_ID, megaco_handle); +} + +/* + * tvb_skip_wsp - Returns the position in tvb of the first non-whitespace + * character following offset or offset + maxlength -1 whichever + * is smaller. + * + * Parameters: + * tvb - The tvbuff in which we are skipping whitespace. + * offset - The offset in tvb from which we begin trying to skip whitespace. + * maxlength - The maximum distance from offset that we may try to skip + * whitespace. + * + * Returns: The position in tvb of the first non-whitespace + * character following offset or offset + maxlength -1 whichever + * is smaller. + */ +static gint tvb_skip_wsp(tvbuff_t* tvb, gint offset, gint maxlength){ + gint counter = offset; + gint end,tvb_len; + guint8 tempchar; + tvb_len = tvb_length(tvb); + end = offset + maxlength; + if(end >= tvb_len){ + end = tvb_len; + } + for(counter = offset; counter < end && + ((tempchar = tvb_get_guint8(tvb,counter)) == ' ' || + tempchar == '\t');counter++); + return (counter); +} + + +/* Start the functions we need for the plugin stuff */ + +#ifndef __ETHEREAL_STATIC__ + +G_MODULE_EXPORT void +plugin_reg_handoff(void){ + proto_reg_handoff_megaco(); +} + +G_MODULE_EXPORT void +plugin_init(plugin_address_table_t *pat +#ifndef PLUGINS_NEED_ADDRESS_TABLE + _U_ +#endif + ){ +/* initialise the table of pointers needed in Win32 DLLs */ + plugin_address_table_init(pat); +/* register the new protocol, protocol fields, and subtrees */ + if (proto_megaco == -1) { /* execute protocol initialization only once */ + proto_register_megaco(); + } +} + +#endif + +/* End the functions we need for plugin stuff */ diff --git a/sctpppids.h b/sctpppids.h new file mode 100644 index 0000000000..642c753fd0 --- /dev/null +++ b/sctpppids.h @@ -0,0 +1,53 @@ +/* sctpppids.h + * Declarations of SCTP payload protocol IDs. + * + * $Id: sctpppids.h,v 1.1 2003/01/14 23:53:33 guy Exp $ + * + * Ethereal - Network traffic analyzer + * By Gerald Combs + * 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. + */ + +#ifndef __SCTPPPIDS_H__ +#define __SCTPPPIDS_H__ + +/* + * SCTP payload protocol IDs. + */ +#define NOT_SPECIFIED_PROTOCOL_ID 0 +#define IUA_PAYLOAD_PROTOCOL_ID 1 +#define M2UA_PAYLOAD_PROTOCOL_ID 2 +#define M3UA_PAYLOAD_PROTOCOL_ID 3 +#define SUA_PAYLOAD_PROTOCOL_ID 4 +#define M2PA_PAYLOAD_PROTOCOL_ID 5 +#define V5UA_PAYLOAD_PROTOCOL_ID 6 +#define H248_PAYLOAD_PROTOCOL_ID 7 +#define BICC_PAYLOAD_PROTOCOL_ID 8 +#define TALI_PAYLOAD_PROTOCOL_ID 9 +#define DUA_PAYLOAD_PROTOCOL_ID 10 +#define ASAP_PAYLOAD_PROTOCOL_ID 11 +#define ENRP_PAYLOAD_PROTOCOL_ID 12 +#define H323_PAYLOAD_PROTOCOL_ID 13 +#define M2TP_PAYLOAD_PROTOCOL_ID 99 /* s-link */ + +/* + * XXX - this came from "packet-asap.c"; is this some PPID value used + * before 11 was assigned? + */ +#define ASAP_OLD_PAYLOAD_PROTOCOL_ID 0xFAEEB5D1 + +#endif /* sctpppids.h */