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

From Alexandro Vaquero: 

fix the call to "rtp_add_address()" to match the new signature;

	fix a problem with the codec displayed in the "Voip Graph"
	for H245 "RequestMode" messages.

svn path=/trunk/; revision=13709
This commit is contained in:
Guy Harris 2005-03-11 03:05:57 +00:00
parent 6285418a43
commit 009de7a662
2 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
asn1/h245/h245.cnf
View File

@ -164,6 +164,36 @@ OpenLogicalChannel
if (h245_pi != NULL) g_snprintf(h245_pi->frame_label, 50, "%s %s", h245_pi->frame_label, codec_type);
#.END
#----------------------------------------------------------------------------------------
#.FN_BODY AudioMode
guint32 value;
offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
ett_h245_AudioMode, AudioMode_choice, "AudioMode",
&value);
codec_type = val_to_str(value, h245_AudioMode_vals, "<unknown>");
if (h245_pi != NULL) g_snprintf(h245_pi->frame_label, 50, "%s %s", h245_pi->frame_label, val_to_str(value, h245_AudioMode_vals, "ukn"));
#.END
#----------------------------------------------------------------------------------------
#.FN_BODY VideoMode
guint32 value;
offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
ett_h245_VideoMode, VideoMode_choice, "VideoMode",
&value);
codec_type = val_to_str(value, h245_VideoMode_vals, "<unknown>");
if (h245_pi != NULL) g_snprintf(h245_pi->frame_label, 50, "%s %s", h245_pi->frame_label, val_to_str(value, h245_VideoMode_vals, "ukn"));
#.END
#----------------------------------------------------------------------------------------
#.FN_BODY DataModeApplication
guint32 value;
offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
ett_h245_DataModeApplication, DataModeApplication_choice, "DataModeApplication",
&value);
codec_type = val_to_str(value, h245_DataModeApplication_vals, "<unknown>");
if (h245_pi != NULL) g_snprintf(h245_pi->frame_label, 50, "%s %s", h245_pi->frame_label, val_to_str(value, h245_DataModeApplication_vals, "ukn"));
#.END
#----------------------------------------------------------------------------------------
#.FN_FTR MasterSlaveDeterminationAck
h245_pi->msg_type = H245_MastSlvDetAck;
@ -375,7 +405,7 @@ guint32 tsapIdentifier;
src_addr.len=4;
src_addr.data=(char *)&ipv4_address;
rtp_add_address(pinfo, &src_addr, ipv4_port, 0, "H245", pinfo->fd->num);
rtp_add_address(pinfo, &src_addr, ipv4_port, 0, "H245", pinfo->fd->num, 0);
}
if((!pinfo->fd->flags.visited) && rtcp_ipv4_address!=0 && rtcp_ipv4_port!=0 && rtcp_handle){
address src_addr;

18
epan/dissectors/packet-h245.c
View File

@ -10649,9 +10649,13 @@ static const per_choice_t VideoMode_choice[] = {
static int
dissect_h245_VideoMode(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
guint32 value;
offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
ett_h245_VideoMode, VideoMode_choice, "VideoMode",
NULL);
&value);
codec_type = val_to_str(value, h245_VideoMode_vals, "<unknown>");
if (h245_pi != NULL) g_snprintf(h245_pi->frame_label, 50, "%s %s", h245_pi->frame_label, val_to_str(value, h245_VideoMode_vals, "ukn"));
return offset;
}
@ -11001,9 +11005,13 @@ static const per_choice_t AudioMode_choice[] = {
static int
dissect_h245_AudioMode(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
guint32 value;
offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
ett_h245_AudioMode, AudioMode_choice, "AudioMode",
NULL);
&value);
codec_type = val_to_str(value, h245_AudioMode_vals, "<unknown>");
if (h245_pi != NULL) g_snprintf(h245_pi->frame_label, 50, "%s %s", h245_pi->frame_label, val_to_str(value, h245_AudioMode_vals, "ukn"));
return offset;
}
@ -11064,9 +11072,13 @@ static const per_choice_t DataModeApplication_choice[] = {
static int
dissect_h245_DataModeApplication(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
guint32 value;
offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
ett_h245_DataModeApplication, DataModeApplication_choice, "DataModeApplication",
NULL);
&value);
codec_type = val_to_str(value, h245_DataModeApplication_vals, "<unknown>");
if (h245_pi != NULL) g_snprintf(h245_pi->frame_label, 50, "%s %s", h245_pi->frame_label, val_to_str(value, h245_DataModeApplication_vals, "ukn"));
return offset;
}