osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Fix two gcc -Wshadow warnings. 

svn path=/trunk/; revision=31736
This commit is contained in:
Bill Meier 2010-01-29 22:16:54 +00:00
parent 080bbacb41
commit cbec3dba8c
4 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
asn1/h245/packet-h245-template.c
View File

@ -324,46 +324,46 @@ static void update_unicast_addr(unicast_addr_t *req_addr, unicast_addr_t *ack_ad
} }
} }
static void h245_setup_channels(packet_info *pinfo, channel_info_t *upcoming_channel) static void h245_setup_channels(packet_info *pinfo, channel_info_t *upcoming_channel_lcl)
{ {
gint *key; gint *key;
GHashTable *rtp_dyn_payload = NULL; GHashTable *rtp_dyn_payload = NULL;
struct srtp_info *dummy_srtp_info = NULL; struct srtp_info *dummy_srtp_info = NULL;
if (!upcoming_channel) return; if (!upcoming_channel_lcl) return;
/* T.38 */ /* T.38 */
if (!strcmp(upcoming_channel->data_type_str, "t38fax")) { if (!strcmp(upcoming_channel_lcl->data_type_str, "t38fax")) {
if (upcoming_channel->media_addr.addr.type!=AT_NONE && upcoming_channel->media_addr.port!=0 && t38_handle) { if (upcoming_channel_lcl->media_addr.addr.type!=AT_NONE && upcoming_channel_lcl->media_addr.port!=0 && t38_handle) {
t38_add_address(pinfo, &upcoming_channel->media_addr.addr, t38_add_address(pinfo, &upcoming_channel_lcl->media_addr.addr,
upcoming_channel->media_addr.port, 0, upcoming_channel_lcl->media_addr.port, 0,
"H245", pinfo->fd->num); "H245", pinfo->fd->num);
} }
return; return;
} }
/* (S)RTP, (S)RTCP */ /* (S)RTP, (S)RTCP */
if (upcoming_channel->rfc2198 > 0) { if (upcoming_channel_lcl->rfc2198 > 0) {
rtp_dyn_payload = g_hash_table_new_full(g_int_hash, g_int_equal, g_free, g_free); rtp_dyn_payload = g_hash_table_new_full(g_int_hash, g_int_equal, g_free, g_free);
key = g_malloc(sizeof(gint)); key = g_malloc(sizeof(gint));
*key = upcoming_channel->rfc2198; *key = upcoming_channel_lcl->rfc2198;
g_hash_table_insert(rtp_dyn_payload, key, g_strdup("red")); g_hash_table_insert(rtp_dyn_payload, key, g_strdup("red"));
} }
if (upcoming_channel->srtp_flag) { if (upcoming_channel_lcl->srtp_flag) {
dummy_srtp_info = se_alloc0(sizeof(struct srtp_info)); dummy_srtp_info = se_alloc0(sizeof(struct srtp_info));
} }
/* DEBUG g_warning("h245_setup_channels media_addr.addr.type %u port %u",upcoming_channel->media_addr.addr.type, upcoming_channel->media_addr.port ); /* DEBUG g_warning("h245_setup_channels media_addr.addr.type %u port %u",upcoming_channel_lcl->media_addr.addr.type, upcoming_channel_lcl->media_addr.port );
*/ */
if (upcoming_channel->media_addr.addr.type!=AT_NONE && upcoming_channel->media_addr.port!=0 && rtp_handle) { if (upcoming_channel_lcl->media_addr.addr.type!=AT_NONE && upcoming_channel_lcl->media_addr.port!=0 && rtp_handle) {
srtp_add_address(pinfo, &upcoming_channel->media_addr.addr, srtp_add_address(pinfo, &upcoming_channel_lcl->media_addr.addr,
upcoming_channel->media_addr.port, 0, upcoming_channel_lcl->media_addr.port, 0,
"H245", pinfo->fd->num, upcoming_channel->is_video , rtp_dyn_payload, dummy_srtp_info); "H245", pinfo->fd->num, upcoming_channel_lcl->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) { if (upcoming_channel_lcl->media_control_addr.addr.type!=AT_NONE && upcoming_channel_lcl->media_control_addr.port!=0 && rtcp_handle) {
srtcp_add_address(pinfo, &upcoming_channel->media_control_addr.addr, srtcp_add_address(pinfo, &upcoming_channel_lcl->media_control_addr.addr,
upcoming_channel->media_control_addr.port, 0, upcoming_channel_lcl->media_control_addr.port, 0,
"H245", pinfo->fd->num, dummy_srtp_info); "H245", pinfo->fd->num, dummy_srtp_info);
} }
} }

24
asn1/h245/packet-h245-template.h
View File

@ -80,19 +80,19 @@ typedef struct {
} h223_lc_params; } h223_lc_params;
typedef enum { typedef enum {
nonStandardDataType, H245_nonStandardDataType,
nullData, H245_nullData,
videoData, H245_videoData,
audioData, H245_audioData,
data, H245_data,
encryptionData, H245_encryptionData,
/*...,*/ /*...,*/
h235Control, H245_h235Control,
h235Media, H245_h235Media,
multiplexedStream, H245_multiplexedStream,
redundancyEncoding, H245_redundancyEncoding,
multiplePayloadStream, H245_multiplePayloadStream,
fec H245_fec
} h245_lc_data_type_enum; } h245_lc_data_type_enum;
typedef struct { typedef struct {

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

@ -455,46 +455,46 @@ static void update_unicast_addr(unicast_addr_t *req_addr, unicast_addr_t *ack_ad
} }
} }
static void h245_setup_channels(packet_info *pinfo, channel_info_t *upcoming_channel) static void h245_setup_channels(packet_info *pinfo, channel_info_t *upcoming_channel_lcl)
{ {
gint *key; gint *key;
GHashTable *rtp_dyn_payload = NULL; GHashTable *rtp_dyn_payload = NULL;
struct srtp_info *dummy_srtp_info = NULL; struct srtp_info *dummy_srtp_info = NULL;
if (!upcoming_channel) return; if (!upcoming_channel_lcl) return;
/* T.38 */ /* T.38 */
if (!strcmp(upcoming_channel->data_type_str, "t38fax")) { if (!strcmp(upcoming_channel_lcl->data_type_str, "t38fax")) {
if (upcoming_channel->media_addr.addr.type!=AT_NONE && upcoming_channel->media_addr.port!=0 && t38_handle) { if (upcoming_channel_lcl->media_addr.addr.type!=AT_NONE && upcoming_channel_lcl->media_addr.port!=0 && t38_handle) {
t38_add_address(pinfo, &upcoming_channel->media_addr.addr, t38_add_address(pinfo, &upcoming_channel_lcl->media_addr.addr,
upcoming_channel->media_addr.port, 0, upcoming_channel_lcl->media_addr.port, 0,
"H245", pinfo->fd->num); "H245", pinfo->fd->num);
} }
return; return;
} }
/* (S)RTP, (S)RTCP */ /* (S)RTP, (S)RTCP */
if (upcoming_channel->rfc2198 > 0) { if (upcoming_channel_lcl->rfc2198 > 0) {
rtp_dyn_payload = g_hash_table_new_full(g_int_hash, g_int_equal, g_free, g_free); rtp_dyn_payload = g_hash_table_new_full(g_int_hash, g_int_equal, g_free, g_free);
key = g_malloc(sizeof(gint)); key = g_malloc(sizeof(gint));
*key = upcoming_channel->rfc2198; *key = upcoming_channel_lcl->rfc2198;
g_hash_table_insert(rtp_dyn_payload, key, g_strdup("red")); g_hash_table_insert(rtp_dyn_payload, key, g_strdup("red"));
} }
if (upcoming_channel->srtp_flag) { if (upcoming_channel_lcl->srtp_flag) {
dummy_srtp_info = se_alloc0(sizeof(struct srtp_info)); dummy_srtp_info = se_alloc0(sizeof(struct srtp_info));
} }
/* DEBUG g_warning("h245_setup_channels media_addr.addr.type %u port %u",upcoming_channel->media_addr.addr.type, upcoming_channel->media_addr.port ); /* DEBUG g_warning("h245_setup_channels media_addr.addr.type %u port %u",upcoming_channel_lcl->media_addr.addr.type, upcoming_channel_lcl->media_addr.port );
*/ */
if (upcoming_channel->media_addr.addr.type!=AT_NONE && upcoming_channel->media_addr.port!=0 && rtp_handle) { if (upcoming_channel_lcl->media_addr.addr.type!=AT_NONE && upcoming_channel_lcl->media_addr.port!=0 && rtp_handle) {
srtp_add_address(pinfo, &upcoming_channel->media_addr.addr, srtp_add_address(pinfo, &upcoming_channel_lcl->media_addr.addr,
upcoming_channel->media_addr.port, 0, upcoming_channel_lcl->media_addr.port, 0,
"H245", pinfo->fd->num, upcoming_channel->is_video , rtp_dyn_payload, dummy_srtp_info); "H245", pinfo->fd->num, upcoming_channel_lcl->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) { if (upcoming_channel_lcl->media_control_addr.addr.type!=AT_NONE && upcoming_channel_lcl->media_control_addr.port!=0 && rtcp_handle) {
srtcp_add_address(pinfo, &upcoming_channel->media_control_addr.addr, srtcp_add_address(pinfo, &upcoming_channel_lcl->media_control_addr.addr,
upcoming_channel->media_control_addr.port, 0, upcoming_channel_lcl->media_control_addr.port, 0,
"H245", pinfo->fd->num, dummy_srtp_info); "H245", pinfo->fd->num, dummy_srtp_info);
} }
} }

24
epan/dissectors/packet-h245.h
View File

@ -88,19 +88,19 @@ typedef struct {
} h223_lc_params; } h223_lc_params;
typedef enum { typedef enum {
nonStandardDataType, H245_nonStandardDataType,
nullData, H245_nullData,
videoData, H245_videoData,
audioData, H245_audioData,
data, H245_data,
encryptionData, H245_encryptionData,
/*...,*/ /*...,*/
h235Control, H245_h235Control,
h235Media, H245_h235Media,
multiplexedStream, H245_multiplexedStream,
redundancyEncoding, H245_redundancyEncoding,
multiplePayloadStream, H245_multiplePayloadStream,
fec H245_fec
} h245_lc_data_type_enum; } h245_lc_data_type_enum;
typedef struct { typedef struct {