aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2013-08-27 12:28:21 +0000
committerPascal Quantin <pascal.quantin@gmail.com>2013-08-27 12:28:21 +0000
commit165caf086939d1d382520f05c107baee8019ec31 (patch)
tree11cf9dde5159c49ba3b4cef73f6d99f3f4bde5ca
parented8115e09983c71b3e369b7f5e2a7af0a361735c (diff)
From Hadar Shoham via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9076 :
MGCP: add support for option mp and fxr/fx svn path=/trunk/; revision=51535
-rw-r--r--AUTHORS2
-rw-r--r--epan/dissectors/packet-mgcp.c18
2 files changed, 19 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index bdb14014ce..0368048cf1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3694,7 +3694,7 @@ Robert Simac <rsimac[AT]cronsult.com>
Johanna Sochos <johanna.sochos[AT]swissqual.com>
Felix Obenhuber <felix[AT]obenhuber.de>
Hilko Bengen <bengen--wireshark[AT]hilluzination.de>
-Hadar Shoham <hadar[AT]ti.com>
+Hadar Shoham <hadar.shoham[AT]gmail.com>
Robert Bullen <robert[AT]robertbullen.com>
Chuck Kristofek <chuck.kristofek[AT]ngc.com>
Markus Renz <Markus.Renz[AT]hirschmann.de>
diff --git a/epan/dissectors/packet-mgcp.c b/epan/dissectors/packet-mgcp.c
index 025ce87062..c01e6d1d32 100644
--- a/epan/dissectors/packet-mgcp.c
+++ b/epan/dissectors/packet-mgcp.c
@@ -7,6 +7,8 @@
* NCS 1.0: PacketCable Network-Based Call Signaling Protocol Specification,
* PKT-SP-EC-MGCP-I09-040113, January 13, 2004, Cable Television
* Laboratories, Inc., http://www.PacketCable.com/
+ * NCS 1.5: PKT-SP-NCS1.5-I03-070412, April 12, 2007 Cable Television
+ * Laboratories, Inc., http://www.PacketCable.com/
* www.iana.org/assignments/mgcp-localconnectionoptions
*
* $Id$
@@ -101,6 +103,8 @@ static int hf_mgcp_param_localconnoptions_t = -1;
static int hf_mgcp_param_localconnoptions_rcnf = -1;
static int hf_mgcp_param_localconnoptions_rdir = -1;
static int hf_mgcp_param_localconnoptions_rsh = -1;
+static int hf_mgcp_param_localconnoptions_mp = -1;
+static int hf_mgcp_param_localconnoptions_fxr = -1;
static int hf_mgcp_param_connectionmode = -1;
static int hf_mgcp_param_reqevents = -1;
static int hf_mgcp_param_restartmethod = -1;
@@ -721,6 +725,12 @@ void proto_register_mgcp(void)
{ &hf_mgcp_param_localconnoptions_rsh,
{ "Resource Sharing (r-sh)", "mgcp.param.localconnectionoptions.rsh", FT_STRING, BASE_NONE, NULL, 0x0,
"Resource Sharing", HFILL }},
+ { &hf_mgcp_param_localconnoptions_mp,
+ { "Multiple Packetization period (mp)", "mgcp.param.localconnectionoptions.mp", FT_STRING, BASE_NONE, NULL, 0x0,
+ "Multiple Packetization period", HFILL }},
+ { &hf_mgcp_param_localconnoptions_fxr,
+ { "FXR (fxr/fx)", "mgcp.param.localconnectionoptions.fxr", FT_STRING, BASE_NONE, NULL, 0x0,
+ "FXR", HFILL }},
{ &hf_mgcp_param_connectionmode,
{ "ConnectionMode (M)", "mgcp.param.connectionmode", FT_STRING, BASE_NONE, NULL, 0x0,
"Connection Mode", HFILL }},
@@ -2064,6 +2074,14 @@ dissect_mgcp_localconnectionoptions(proto_tree *parent_tree, tvbuff_t *tvb, gint
{
hf_string = hf_mgcp_param_localconnoptions_rsh;
}
+ else if (!g_ascii_strcasecmp(g_strstrip(typval[0]), "mp"))
+ {
+ hf_string = hf_mgcp_param_localconnoptions_mp;
+ }
+ else if (!g_ascii_strcasecmp(g_strstrip(typval[0]), "fxr/fx"))
+ {
+ hf_string = hf_mgcp_param_localconnoptions_fxr;
+ }
else
{
hf_uint = -1;