forked from osmocom/wireshark
From Sebastien Tandel:
First patch fixes warning of profinet and megaco plugins to compile again with gcc-4.1.2. svn path=/trunk/; revision=21155
This commit is contained in:
parent
6d8d2854c8
commit
8973617e4b
|
@ -155,8 +155,8 @@ static dissector_handle_t megaco_text_handle;
|
|||
* a detailed tree that expresses a somewhat more semantically meaningful
|
||||
* decode.
|
||||
*/
|
||||
static int global_megaco_txt_tcp_port = PORT_MEGACO_TXT;
|
||||
static int global_megaco_txt_udp_port = PORT_MEGACO_TXT;
|
||||
static guint global_megaco_txt_tcp_port = PORT_MEGACO_TXT;
|
||||
static guint global_megaco_txt_udp_port = PORT_MEGACO_TXT;
|
||||
#if 0
|
||||
static int global_megaco_bin_tcp_port = PORT_MEGACO_BIN;
|
||||
static int global_megaco_bin_udp_port = PORT_MEGACO_BIN;
|
||||
|
@ -344,7 +344,7 @@ dissect_megaco_text(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
* tvb_offset = tvb_find_guint8(tvb, tvb_offset, 5, 'M');
|
||||
*/
|
||||
if(!tvb_get_nstringz0(tvb,tvb_offset,sizeof(word),word)) return;
|
||||
if (strncasecmp(word, "MEGACO", 6) != 0 && tvb_get_guint8(tvb, tvb_offset ) != '!'){
|
||||
if (strncasecmp((gchar*)word, "MEGACO", 6) != 0 && (gchar)tvb_get_guint8(tvb, tvb_offset ) != '!'){
|
||||
call_dissector(h248_handle,tvb,pinfo,tree);
|
||||
return;
|
||||
}
|
||||
|
@ -998,7 +998,7 @@ nextcontext:
|
|||
TermID[0] = 'e';
|
||||
my_proto_tree_add_string(megaco_tree_command_line, hf_megaco_termid, tvb,
|
||||
tvb_offset, tokenlen,
|
||||
TermID);
|
||||
(gchar*)TermID);
|
||||
break;
|
||||
|
||||
case '*':
|
||||
|
@ -2116,7 +2116,7 @@ dissect_megaco_servicechangedescriptor(tvbuff_t *tvb, proto_tree *megaco_tree,
|
|||
break;
|
||||
|
||||
tvb_get_nstringz0(tvb,tvb_current_offset,4,ServiceChangeReason_str);
|
||||
reason = atoi(ServiceChangeReason_str);
|
||||
reason = atoi((gchar*)ServiceChangeReason_str);
|
||||
|
||||
proto_item_append_text(item,"[ %s ]", val_to_str(reason, MEGACO_ServiceChangeReasons_vals,"Unknown (%u)"));
|
||||
break;
|
||||
|
@ -2596,7 +2596,7 @@ dissect_megaco_errordescriptor(tvbuff_t *tvb, proto_tree *megaco_tree_command_li
|
|||
tvb_current_offset = tvb_find_guint8(tvb, tvb_previous_offset , tvb_RBRKT, '=');
|
||||
tvb_current_offset = tvb_skip_wsp(tvb, tvb_current_offset +1);
|
||||
tvb_get_nstringz0(tvb,tvb_current_offset,4,error);
|
||||
error_code = atoi(error);
|
||||
error_code = atoi((gchar*)error);
|
||||
proto_tree_add_string_hidden(megaco_tree_command_line, hf_megaco_error_descriptor, tvb,
|
||||
tvb_current_offset, 3,
|
||||
tvb_format_text(tvb, tvb_current_offset,
|
||||
|
@ -2964,7 +2964,7 @@ dissect_megaco_LocalControldescriptor(tvbuff_t *tvb, proto_tree *megaco_mediades
|
|||
tokenlen));
|
||||
|
||||
tvb_get_nstringz0(tvb,tvb_current_offset,3,code_str);
|
||||
proto_item_append_text(item,"[ %s ]", val_to_str(strtoul(code_str,NULL,16), dscp_vals,"Unknown (%u)"));
|
||||
proto_item_append_text(item,"[ %s ]", val_to_str(strtoul((gchar*)code_str,NULL,16), dscp_vals,"Unknown (%u)"));
|
||||
|
||||
tvb_current_offset = tvb_skip_wsp(tvb, tvb_offset +1);
|
||||
break;
|
||||
|
|
|
@ -588,7 +588,7 @@ cba_acco_add(packet_info *pinfo, const char *acco)
|
|||
}
|
||||
ip = g_ntohl(ip);
|
||||
|
||||
pdev = cba_pdev_add(pinfo, (char *) &ip);
|
||||
pdev = cba_pdev_add(pinfo, (guint8 *) &ip);
|
||||
delim++;
|
||||
|
||||
ldev = cba_ldev_add(pinfo, pdev, delim);
|
||||
|
|
Loading…
Reference in New Issue