osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Make MGCP a builtin dissector to reduce the number of plugins. 

(Leave the MGCP plugin dir for now).

svn path=/trunk/; revision=23190
This commit is contained in:
Anders Broman 2007-10-15 18:57:10 +00:00
parent 5ba3d8aaaa
commit 3c419f798c
11 changed files with 2388 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -236,7 +236,6 @@ plugin_ldadd = \
-dlopen plugins/lwres/lwres.la \
-dlopen plugins/m2m/m2m.la \
-dlopen plugins/mate/mate.la \
-dlopen plugins/mgcp/mgcp.la \
-dlopen plugins/opcua/opcua.la \
-dlopen plugins/opsi/opsi.la \
-dlopen plugins/pcli/pcli.la \

1
Makefile.nmake
View File

@ -893,7 +893,6 @@ install-common-files:
xcopy ".\plugins\lwres\lwres.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d
xcopy ".\plugins\m2m\m2m.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d
xcopy ".\plugins\mate\mate.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d
xcopy ".\plugins\mgcp\mgcp.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d
xcopy ".\plugins\opcua\opcua.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d
xcopy ".\plugins\opsi\opsi.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d
xcopy ".\plugins\pcli\pcli.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d

1
configure.in
View File

@ -1572,7 +1572,6 @@ AC_OUTPUT(
plugins/lwres/Makefile
plugins/m2m/Makefile
plugins/mate/Makefile
plugins/mgcp/Makefile
plugins/opcua/Makefile
plugins/opsi/Makefile
plugins/pcli/Makefile

4
epan/dissectors/Makefile.common
View File

@ -509,6 +509,7 @@ CLEAN_DISSECTOR_SRC = \
packet-mdshdr.c \
packet-media.c \
packet-megaco.c \
packet-mgcp.c \
packet-mikey.c \
packet-mip.c \
packet-mip6.c \
@ -672,7 +673,7 @@ CLEAN_DISSECTOR_SRC = \
packet-socks.c \
packet-spp.c \
packet-spray.c \
packet-srp.c \
packet-srp.c \
packet-sscf-nni.c \
packet-srvloc.c \
packet-sscop.c \
@ -917,6 +918,7 @@ DISSECTOR_INCLUDES = \
packet-ldp.h \
packet-llc.h \
packet-logotypecertextn.h \
packet-mgcp.h \
packet-mikey.h \
packet-mip6.h \
packet-mms.h \

2318
epan/dissectors/packet-mgcp.c Normal file
View File

File diff suppressed because it is too large Load Diff

67
epan/dissectors/packet-mgcp.h Normal file
View File

@ -0,0 +1,67 @@
/* packet-mgcp.h
* Routines for mgcp packet disassembly
* RFC 2705
*
* $Id$
*
* Copyright (c) 2000 by Ed Warnicke <hagbard@physics.rutgers.edu>
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
* 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.
*/
/* A simple MGCP type that is occasionally handy */
typedef enum _mgcp_type
{
MGCP_REQUEST,
MGCP_RESPONSE,
MGCP_OTHERS
} mgcp_type_t;
/* Container for tapping relevant data */
typedef struct _mgcp_info_t
{
mgcp_type_t mgcp_type;
char code[5];
guint32 transid;
nstime_t req_time;
gboolean is_duplicate;
gboolean request_available;
guint32 req_num; /* frame number request seen */
gchar *endpointId;
gchar *observedEvents;
guint32 rspcode;
gchar *signalReq;
gboolean hasDigitMap;
} mgcp_info_t;
/* Item of request list */
typedef struct _mgcp_call_t
{
guint32 transid;
char code[5];
guint32 req_num; /* frame number request seen */
guint32 rsp_num; /* frame number response seen */
guint32 rspcode;
nstime_t req_time;
gboolean responded;
} mgcp_call_t;
void proto_register_mgcp(void);
void proto_reg_handoff_mgcp(void);

1
packaging/nsis/Makefile.nmake
View File

@ -79,7 +79,6 @@ PLUGINS= \
../../plugins/lwres/lwres.dll \
../../plugins/m2m/m2m.dll \
../../plugins/mate/mate.dll \
../../plugins/mgcp/mgcp.dll \
../../plugins/opsi/opsi.dll \
../../plugins/pcli/pcli.dll \
../../plugins/rlm/rlm.dll \

1
packaging/nsis/wireshark.nsi
View File

@ -768,7 +768,6 @@ File "..\..\plugins\gryphon\gryphon.dll"
File "..\..\plugins\irda\irda.dll"
File "..\..\plugins\lwres\lwres.dll"
File "..\..\plugins\m2m\m2m.dll"
File "..\..\plugins\mgcp\mgcp.dll"
File "..\..\plugins\opsi\opsi.dll"
File "..\..\plugins\pcli\pcli.dll"
File "..\..\plugins\profinet\profinet.dll"

1
packaging/u3/win32/makefile.nmake
View File

@ -146,7 +146,6 @@ distribution: host-dirs device-dirs data-dirs manifest-dirs manifest.u3i u3util
$(COPY) $(TOPDIR)\plugins\lwres\lwres.dll $(DEVICE)\plugins\$(VERSION) $(COPY_FLAGS)
$(COPY) $(TOPDIR)\plugins\m2m\m2m.dll $(DEVICE)\plugins\$(VERSION) $(COPY_FLAGS)
$(COPY) $(TOPDIR)\plugins\mate\mate.dll $(DEVICE)\plugins\$(VERSION) $(COPY_FLAGS)
$(COPY) $(TOPDIR)\plugins\mgcp\mgcp.dll $(DEVICE)\plugins\$(VERSION) $(COPY_FLAGS)
$(COPY) $(TOPDIR)\plugins\opsi\opsi.dll $(DEVICE)\plugins\$(VERSION) $(COPY_FLAGS)
$(COPY) $(TOPDIR)\plugins\pcli\pcli.dll $(DEVICE)\plugins\$(VERSION) $(COPY_FLAGS)
$(COPY) $(TOPDIR)\plugins\profinet\profinet.dll $(DEVICE)\plugins\$(VERSION) $(COPY_FLAGS)

1
plugins/Makefile.am
View File

@ -34,7 +34,6 @@ SUBDIRS = \
lwres \
m2m \
mate \
mgcp \
opcua \
opsi \
pcli \

16
plugins/Makefile.nmake
View File

@ -21,7 +21,6 @@ all: \
lwres \
m2m \
mate \
mgcp \
opcua \
opsi \
pcli \
@ -105,11 +104,6 @@ mate::
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
cd ..
mgcp::
cd mgcp
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
cd ..
opcua::
cd opcua
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
@ -218,9 +212,6 @@ clean: clean-local
cd mate
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
cd ..
cd mgcp
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
cd ..
cd opcua
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
cd ..
@ -304,9 +295,6 @@ distclean: distclean-local
cd mate
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
cd ..
cd mgcp
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
cd ..
cd opcua
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
cd ..
@ -390,9 +378,6 @@ maintainer-clean: maintainer-clean-local
cd mate
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
cd ..
cd mgcp
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
cd ..
cd opcua
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
cd ..
@ -453,7 +438,6 @@ install-plugins:
xcopy lwres\*.dll $(VERSION) /d
xcopy m2m\*.dll $(VERSION) /d
xcopy mate\*.dll $(VERSION) /d
xcopy mgcp\*.dll $(VERSION) /d
xcopy opcua\*.dll $(VERSION) /d
xcopy opsi\*.dll $(VERSION) /d
xcopy pcli\*.dll $(VERSION) /d