diff options
| -rw-r--r-- | config.nmake | 8 | ||||
| -rw-r--r-- | packet-rtp.c | 33 | ||||
| -rw-r--r-- | packet-sdp.c | 18 | ||||
| -rw-r--r-- | rtp_pt.h | 35 |
4 files changed, 53 insertions, 41 deletions
diff --git a/config.nmake b/config.nmake index 618c31674c..4e333a01a9 100644 --- a/config.nmake +++ b/config.nmake @@ -1,4 +1,4 @@ -# $Id: config.nmake,v 1.89 2004/05/23 22:21:30 guy Exp $ +# $Id: config.nmake,v 1.90 2004/06/01 21:40:41 etxrab Exp $ VERSION=0.10.4 # @@ -54,7 +54,7 @@ GLIB_DIR=$(ETHEREAL_LIBS)\glib # reside. # GTK1_DIR=$(ETHEREAL_LIBS)\gtk+ -#GTK2_DIR=$(ETHEREAL_LIBS)\gtk2 +GTK2_DIR=$(ETHEREAL_LIBS)\gtk2 # Declare the version of your gtk2 and pango. (MAJOR + MINOR Version number # but without MICRO version number) @@ -70,7 +70,7 @@ PANGO_INST_VERSION=1.2 # If you don't have GTK-Wimp, comment this line out, so that GTK-Wimp isn't # defined. # -#GTK_WIMP_DIR=$(ETHEREAL_LIBS)\gtk-wimp +GTK_WIMP_DIR=$(ETHEREAL_LIBS)\gtk-wimp # # If you have Zlib, set this to the pathname of the directory in @@ -134,7 +134,7 @@ LOCAL_CFLAGS=/Zi /W3 LOCAL_LDFLAGS=/DEBUG # Set PDB_FILE according to your VC++ version -PDB_FILE=vc*.pdb +PDB_FILE=vc60.pdb # Set path if you need to find some binary PATH=c:\cygwin\bin;c:\python23;$(PATH) diff --git a/packet-rtp.c b/packet-rtp.c index ab19970781..e1b9f5730c 100644 --- a/packet-rtp.c +++ b/packet-rtp.c @@ -6,7 +6,7 @@ * Copyright 2000, Philips Electronics N.V. * Written by Andreas Sikkema <h323@ramdyne.nl> * - * $Id: packet-rtp.c,v 1.45 2004/02/14 22:48:53 guy Exp $ + * $Id: packet-rtp.c,v 1.46 2004/06/01 21:40:41 etxrab Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -138,36 +138,7 @@ static const value_string rtp_version_vals[] = /* Payload type is the last 7 bits */ #define RTP_PAYLOAD_TYPE(octet) ((octet) & 0x7F) -static const value_string rtp_payload_type_vals[] = -{ - { PT_PCMU, "ITU-T G.711 PCMU" }, - { PT_1016, "USA Federal Standard FS-1016" }, - { PT_G721, "ITU-T G.721" }, - { PT_GSM, "GSM 06.10" }, - { PT_G723, "ITU-T G.723" }, - { PT_DVI4_8000, "DVI4 8000 samples/s" }, - { PT_DVI4_16000, "DVI4 16000 samples/s" }, - { PT_LPC, "Experimental linear predictive encoding from Xerox PARC" }, - { PT_PCMA, "ITU-T G.711 PCMA" }, - { PT_G722, "ITU-T G.722" }, - { PT_L16_STEREO, "16-bit uncompressed audio, stereo" }, - { PT_L16_MONO, "16-bit uncompressed audio, monaural" }, - { PT_QCELP, "Qualcomm Code Excited Linear Predictive coding" }, - { PT_CN, "Comfort noise" }, - { PT_MPA, "MPEG-I/II Audio"}, - { PT_G728, "ITU-T G.728" }, - { PT_DVI4_11025, "DVI4 11025 samples/s" }, - { PT_DVI4_22050, "DVI4 22050 samples/s" }, - { PT_G729, "ITU-T G.729" }, - { PT_CELB, "Sun CellB video encoding" }, - { PT_JPEG, "JPEG-compressed video" }, - { PT_NV, "'nv' program" }, - { PT_H261, "ITU-T H.261" }, - { PT_MPV, "MPEG-I/II Video"}, - { PT_MP2T, "MPEG-II transport streams"}, - { PT_H263, "ITU-T H.263" }, - { 0, NULL }, -}; +/* rtp_payload_type_vals[] defined in rtp_pt.h */ static address fake_addr; static int heur_init = FALSE; diff --git a/packet-sdp.c b/packet-sdp.c index 3ae34fca31..69bb46cb20 100644 --- a/packet-sdp.c +++ b/packet-sdp.c @@ -4,7 +4,7 @@ * Jason Lango <jal@netapp.com> * Liberally copied from packet-http.c, by Guy Harris <guy@alum.mit.edu> * - * $Id: packet-sdp.c,v 1.45 2004/01/16 19:51:55 guy Exp $ + * $Id: packet-sdp.c,v 1.46 2004/06/01 21:40:41 etxrab Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -48,6 +48,7 @@ #include <epan/packet.h> #include <epan/conversation.h> #include <epan/strutil.h> +#include "rtp_pt.h" static dissector_handle_t rtp_handle=NULL; static dissector_handle_t rtcp_handle=NULL; @@ -774,6 +775,7 @@ dissect_sdp_media(tvbuff_t *tvb, proto_item *ti, transport_info_t *transport_info){ proto_tree *sdp_media_tree; gint offset, next_offset, tokenlen; + guint8 *media_format; offset = 0; next_offset = 0; @@ -854,8 +856,14 @@ dissect_sdp_media(tvbuff_t *tvb, proto_item *ti, tokenlen = next_offset - offset; } - proto_tree_add_item(sdp_media_tree, hf_media_format, tvb, - offset, tokenlen, FALSE); + media_format = tvb_get_string(tvb, offset, tokenlen); + if (!strcmp(transport_info->media_proto[transport_info->media_count], "RTP/AVP")) { + proto_tree_add_string(sdp_media_tree, hf_media_format, tvb, + offset, tokenlen, val_to_str(atol(media_format), rtp_payload_type_vals, "%u")); + } else { + proto_tree_add_item(sdp_media_tree, hf_media_format, tvb, + offset, tokenlen, FALSE); + } } while (next_offset != -1); /* Increase the count of media channels, but don't walk off the end @@ -1033,7 +1041,7 @@ proto_register_sdp(void) { &hf_bandwidth_value, { "Bandwidth Value", "sdp.bandwidth.value",FT_STRING, BASE_NONE, NULL, 0x0, - "Bandwidth Value", HFILL }}, + "Bandwidth Value (in kbits/s)", HFILL }}, { &hf_time_start, { "Session Start Time", "sdp.time.start",FT_STRING, BASE_NONE, NULL, 0x0, @@ -1093,7 +1101,7 @@ proto_register_sdp(void) { &hf_media_proto, { "Media Proto", "sdp.media.proto",FT_STRING, BASE_NONE, NULL, 0x0, - "Media Proto", HFILL }}, + "Media Protocol", HFILL }}, { &hf_media_format, { "Media Format", "sdp.media.format",FT_STRING, BASE_NONE, NULL, 0x0, @@ -1,7 +1,7 @@ /* rtp_pt.h * Defines RTP payload types * - * $Id: rtp_pt.h,v 1.2 2003/09/25 19:35:02 guy Exp $ + * $Id: rtp_pt.h,v 1.3 2004/06/01 21:40:41 etxrab Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -25,6 +25,8 @@ #ifndef __RTP_PT_H__ #define __RTP_PT_H__ +#include "epan/value_string.h" + /* * RTP Payload types * Table B.2 / H.225.0 @@ -60,4 +62,35 @@ #define PT_MP2T 33 /* RFC 2250 */ #define PT_H263 34 /* from Chunrong Zhu of Intel; see the Web page */ +static const value_string rtp_payload_type_vals[] = +{ + { PT_PCMU, "ITU-T G.711 PCMU" }, + { PT_1016, "USA Federal Standard FS-1016" }, + { PT_G721, "ITU-T G.721" }, + { PT_GSM, "GSM 06.10" }, + { PT_G723, "ITU-T G.723" }, + { PT_DVI4_8000, "DVI4 8000 samples/s" }, + { PT_DVI4_16000, "DVI4 16000 samples/s" }, + { PT_LPC, "Experimental linear predictive encoding from Xerox PARC" }, + { PT_PCMA, "ITU-T G.711 PCMA" }, + { PT_G722, "ITU-T G.722" }, + { PT_L16_STEREO, "16-bit uncompressed audio, stereo" }, + { PT_L16_MONO, "16-bit uncompressed audio, monaural" }, + { PT_QCELP, "Qualcomm Code Excited Linear Predictive coding" }, + { PT_CN, "Comfort noise" }, + { PT_MPA, "MPEG-I/II Audio"}, + { PT_G728, "ITU-T G.728" }, + { PT_DVI4_11025, "DVI4 11025 samples/s" }, + { PT_DVI4_22050, "DVI4 22050 samples/s" }, + { PT_G729, "ITU-T G.729" }, + { PT_CELB, "Sun CellB video encoding" }, + { PT_JPEG, "JPEG-compressed video" }, + { PT_NV, "'nv' program" }, + { PT_H261, "ITU-T H.261" }, + { PT_MPV, "MPEG-I/II Video"}, + { PT_MP2T, "MPEG-II transport streams"}, + { PT_H263, "ITU-T H.263" }, + { 0, NULL }, +}; + #endif |