diff options
author | Anders Broman <anders.broman@ericsson.com> | 2009-05-27 18:22:39 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2009-05-27 18:22:39 +0000 |
commit | b6b645feb385d91e97391e8f4be5dabe91b0a4f8 (patch) | |
tree | 5ec54b97039d4978c9975e3427f9ba374109910b /asn1/h245 | |
parent | 2c917c9f4300cc3c4d1e0847afdeea49fefc81e9 (diff) |
Detect if the setup channel is video or not.
svn path=/trunk/; revision=28509
Diffstat (limited to 'asn1/h245')
-rw-r--r-- | asn1/h245/h245.cnf | 13 | ||||
-rw-r--r-- | asn1/h245/packet-h245-template.c | 6 |
2 files changed, 17 insertions, 2 deletions
diff --git a/asn1/h245/h245.cnf b/asn1/h245/h245.cnf index 8d8038b862..d92725bee0 100644 --- a/asn1/h245/h245.cnf +++ b/asn1/h245/h245.cnf @@ -995,6 +995,19 @@ NonStandardIdentifier/h221NonStandard/manufacturerCode VAL_PTR = &manufacturerC h245_pi = saved_h245_pi; } +#.FN_BODY DataType VAL_PTR = &choice_index +gint choice_index; + +%(DEFAULT_BODY)s + +if (upcoming_channel){ + if (choice_index==2){ + upcoming_channel->is_video=TRUE; + }else{ + upcoming_channel->is_video=FALSE; + } +} + #---------------------------------------------------------------------------------------- #.TYPE_RENAME diff --git a/asn1/h245/packet-h245-template.c b/asn1/h245/packet-h245-template.c index 9f8b4389a3..70d03cea04 100644 --- a/asn1/h245/packet-h245-template.c +++ b/asn1/h245/packet-h245-template.c @@ -353,11 +353,13 @@ static void h245_setup_channels(packet_info *pinfo, channel_info_t *upcoming_cha if (upcoming_channel->srtp_flag) { dummy_srtp_info = se_alloc0(sizeof(struct srtp_info)); } - /* FIX ME indicate if Video - temp always false */ + + /* DEBUG g_warning("h245_setup_channels media_addr.addr.type %u port %u",upcoming_channel->media_addr.addr.type, upcoming_channel->media_addr.port ); + */ if (upcoming_channel->media_addr.addr.type!=AT_NONE && upcoming_channel->media_addr.port!=0 && rtp_handle) { srtp_add_address(pinfo, &upcoming_channel->media_addr.addr, upcoming_channel->media_addr.port, 0, - "H245", pinfo->fd->num, /*upcoming_channel->is_video*/ FALSE, rtp_dyn_payload, dummy_srtp_info); + "H245", pinfo->fd->num, upcoming_channel->is_video , rtp_dyn_payload, dummy_srtp_info); } if (upcoming_channel->media_control_addr.addr.type!=AT_NONE && upcoming_channel->media_control_addr.port!=0 && rtcp_handle) { srtcp_add_address(pinfo, &upcoming_channel->media_control_addr.addr, |