Fix about 100 simple to fix warnings from gcc 4.0 in epan/dissectors
svn path=/trunk/; revision=21233
This commit is contained in:
parent
ddddf2d668
commit
ab8f589336
|
@ -1590,7 +1590,8 @@ name_in_bitmap(tvbuff_t *tvb, gint offset, guint16 bitmap, int isdir)
|
|||
tp_ofs = nameoff +org_offset;
|
||||
len = tvb_get_guint8(tvb, tp_ofs);
|
||||
tp_ofs++;
|
||||
name = tvb_get_ephemeral_string(tvb, tp_ofs, len);
|
||||
name = (gchar*)tvb_get_ephemeral_string(tvb, tp_ofs,
|
||||
len);
|
||||
return name;
|
||||
}
|
||||
offset += 2;
|
||||
|
@ -1628,7 +1629,8 @@ name_in_bitmap(tvbuff_t *tvb, gint offset, guint16 bitmap, int isdir)
|
|||
tp_ofs = nameoff +org_offset +4;
|
||||
len16 = tvb_get_ntohs(tvb, tp_ofs);
|
||||
tp_ofs += 2;
|
||||
name = tvb_get_ephemeral_string(tvb, tp_ofs, len16);
|
||||
name = (gchar*)tvb_get_ephemeral_string(tvb, tp_ofs,
|
||||
len16);
|
||||
return name;
|
||||
}
|
||||
}
|
||||
|
@ -2391,7 +2393,7 @@ dissect_query_afp_login(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
|
|||
proto_tree_add_item(tree, hf_afp_AFPVersion, tvb, offset, 1,FALSE);
|
||||
offset += len +1;
|
||||
len_uam = tvb_get_guint8(tvb, offset);
|
||||
uam = tvb_get_ptr(tvb, offset +1, len_uam);
|
||||
uam = (char*)tvb_get_ptr(tvb, offset +1, len_uam);
|
||||
proto_tree_add_item(tree, hf_afp_UAM, tvb, offset, 1,FALSE);
|
||||
offset += len_uam +1;
|
||||
|
||||
|
@ -2426,7 +2428,7 @@ dissect_query_afp_login_ext(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t
|
|||
offset += len +1;
|
||||
|
||||
len_uam = tvb_get_guint8(tvb, offset);
|
||||
uam = tvb_get_ptr(tvb, offset +1, len_uam);
|
||||
uam = (char*)tvb_get_ptr(tvb, offset +1, len_uam);
|
||||
proto_tree_add_item(tree, hf_afp_UAM, tvb, offset, 1,FALSE);
|
||||
offset += len_uam +1;
|
||||
|
||||
|
|
|
@ -199,7 +199,7 @@ static guint get_bittorrent_pdu_length(packet_info *pinfo _U_, tvbuff_t *tvb, in
|
|||
guint32 length;
|
||||
|
||||
if (tvb_get_guint8(tvb, offset) == 19 &&
|
||||
tvb_memeql(tvb, offset + 1, "BitTorrent protocol", 19) == 0) {
|
||||
tvb_memeql(tvb, offset + 1, (guint8*)"BitTorrent protocol", 19) == 0) {
|
||||
/* Return the length of a Handshake message */
|
||||
return 1 + /* pstrlen */
|
||||
19 + /* pstr */
|
||||
|
@ -540,7 +540,7 @@ static void dissect_bittorrent_message (tvbuff_t *tvb, packet_info *pinfo, proto
|
|||
for ( i=0 ; amp_messages[i].name ; i++ ) {
|
||||
if (strlen(amp_messages[i].name)==typelen &&
|
||||
tvb_memeql(tvb, offset + BITTORRENT_HEADER_LENGTH + 4,
|
||||
amp_messages[i].name, strlen(amp_messages[i].name))==0) {
|
||||
(guint8*)amp_messages[i].name, strlen(amp_messages[i].name))==0) {
|
||||
|
||||
prio = tvb_get_guint8(tvb, offset + BITTORRENT_HEADER_LENGTH + 4 + typelen);
|
||||
if (prio==0 || prio==1 || prio==2) {
|
||||
|
@ -706,15 +706,15 @@ static void dissect_bittorrent_welcome (tvbuff_t *tvb, packet_info *pinfo _U_, p
|
|||
if(decode_client_information) {
|
||||
for(i = 0; peer_id[i].id[0] != '\0'; ++i)
|
||||
{
|
||||
if(tvb_memeql(tvb, offset, peer_id[i].id, strlen(peer_id[i].id)) == 0) {
|
||||
if(tvb_memeql(tvb, offset, (guint8*)peer_id[i].id, strlen(peer_id[i].id)) == 0) {
|
||||
/* The version number is 4 numeric characters for the
|
||||
client ids beginning with '-' and 3 characters for the
|
||||
rest. */
|
||||
version = tvb_get_string(tvb, offset + strlen(peer_id[i].id),
|
||||
(peer_id[i].id[0] == '-') ? 4 : 3);
|
||||
((guint8*)peer_id[i].id[0] == '-') ? 4 : 3);
|
||||
proto_tree_add_text(tree, tvb, offset, 20, "Client is %s v%s",
|
||||
peer_id[i].name,
|
||||
format_text(version, (peer_id[i].id[0] == '-') ? 4 : 3));
|
||||
format_text((guchar*)version, (peer_id[i].id[0] == '-') ? 4 : 3));
|
||||
g_free(version);
|
||||
break;
|
||||
}
|
||||
|
@ -739,7 +739,7 @@ static void dissect_bittorrent_tcp_pdu (tvbuff_t *tvb, packet_info *pinfo, proto
|
|||
tree = proto_item_add_subtree(ti, ett_bittorrent);
|
||||
|
||||
if (tvb_get_guint8(tvb, 0) == 19 &&
|
||||
tvb_memeql(tvb, 1, "BitTorrent protocol", 19) == 0) {
|
||||
tvb_memeql(tvb, 1, (guint8*)"BitTorrent protocol", 19) == 0) {
|
||||
dissect_bittorrent_welcome(tvb, pinfo, tree);
|
||||
} else {
|
||||
dissect_bittorrent_message(tvb, pinfo, tree);
|
||||
|
@ -764,7 +764,7 @@ static gboolean test_bittorrent_packet (tvbuff_t *tvb, packet_info *pinfo,
|
|||
|
||||
if (tvb_bytes_exist(tvb, 0, 20) &&
|
||||
tvb_get_guint8(tvb, 0) == 19 &&
|
||||
tvb_memeql(tvb, 1, "BitTorrent protocol", 19) == 0) {
|
||||
tvb_memeql(tvb, 1, (guint8*)"BitTorrent protocol", 19) == 0) {
|
||||
conversation = conversation_new (pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
|
||||
|
||||
conversation_set_dissector(conversation, dissector_handle);
|
||||
|
|
|
@ -1361,7 +1361,7 @@ static guchar*format_asn_value (struct variable_list *variable, subid_t *variabl
|
|||
variable->type=mib_to_asn_type(subtree->type);
|
||||
|
||||
if (!sprint_realloc_by_type(&buf, &buf_len, &out_len, FALSE, variable, subtree->enums, subtree->hint, NULL))
|
||||
g_snprintf(buf,SPRINT_MAX_LEN,"%s","sprint_realloc_by_type failed");
|
||||
g_snprintf((char*)buf,SPRINT_MAX_LEN,"%s","sprint_realloc_by_type failed");
|
||||
|
||||
return buf;
|
||||
}
|
||||
|
@ -1448,7 +1448,7 @@ static int decode_cops_pr_asn1_data(tvbuff_t *tvb,packet_info *pinfo, guint32 of
|
|||
value = vb_integer_value;
|
||||
variable.val.integer = &value;
|
||||
variable.val_len = vb_length ;
|
||||
vb_display_string=format_asn_value(&variable,
|
||||
vb_display_string=(gchar*)format_asn_value(&variable,
|
||||
last_decoded_prid_oid,last_decoded_prid_oid_length,ASN_INTEGER);
|
||||
|
||||
proto_tree_add_text(tree, tvb, vb_value_start, length,
|
||||
|
@ -1475,7 +1475,7 @@ static int decode_cops_pr_asn1_data(tvbuff_t *tvb,packet_info *pinfo, guint32 of
|
|||
variable.val.integer = &value;
|
||||
variable.val_len = vb_length;
|
||||
|
||||
vb_display_string=format_asn_value(&variable,
|
||||
vb_display_string=(gchar*)format_asn_value(&variable,
|
||||
last_decoded_prid_oid,last_decoded_prid_oid_length,ASN_UINTEGER);
|
||||
|
||||
proto_tree_add_text(tree,tvb, vb_value_start, length, "Value %s: %s",vb_type_name, vb_display_string);
|
||||
|
@ -1504,7 +1504,7 @@ static int decode_cops_pr_asn1_data(tvbuff_t *tvb,packet_info *pinfo, guint32 of
|
|||
variable.type = 0;
|
||||
variable.val.string = vb_octet_string;
|
||||
variable.val_len = vb_length;
|
||||
vb_display_string = format_asn_value(&variable,
|
||||
vb_display_string = (gchar*)format_asn_value(&variable,
|
||||
last_decoded_prid_oid,last_decoded_prid_oid_length,ASN_OCTET_STR);
|
||||
proto_tree_add_text(tree, tvb, vb_value_start, length,
|
||||
"Value: %s (ASN.1 type from packet: %s)", vb_display_string, vb_type_name);
|
||||
|
|
|
@ -529,7 +529,7 @@ dcm_tag2str(guint16 grp, guint16 elm, guint8 syntax, tvbuff_t *tvb, int offset,
|
|||
p+=MIN(MAX_BUF_LEN-(p-buf),
|
||||
g_snprintf(p, MAX_BUF_LEN-(p-buf), "%s", dtag->desc));
|
||||
if (vr > 0) {
|
||||
vval = tvb_format_text(tvb, vr, 2);
|
||||
vval = (guint8*)tvb_format_text(tvb, vr, 2);
|
||||
p+=MIN(MAX_BUF_LEN-(p-buf),
|
||||
g_snprintf(p, MAX_BUF_LEN-(p-buf), " [%s]", vval));
|
||||
}
|
||||
|
@ -537,7 +537,7 @@ dcm_tag2str(guint16 grp, guint16 elm, guint8 syntax, tvbuff_t *tvb, int offset,
|
|||
switch (tr > 0 ? tr : dtag->dtype) {
|
||||
case DCM_TSTR:
|
||||
default: /* try ascii */
|
||||
vval = tvb_format_text(tvb, offset, len);
|
||||
vval = (guint8*)tvb_format_text(tvb, offset, len);
|
||||
p+=MIN(MAX_BUF_LEN-(p-buf),
|
||||
g_snprintf(p, MAX_BUF_LEN-(p-buf), " %s", vval));
|
||||
break;
|
||||
|
@ -639,7 +639,7 @@ dissect_dcm_assoc(dcmState_t *dcm_data, proto_item *ti, tvbuff_t *tvb, int offse
|
|||
proto_tree_add_item(dcm_tree, hf_dcm_pdi_syntax, tvb, offset, len > 65 ? 65 : len, FALSE);
|
||||
if (reply && di && di->valid) {
|
||||
name = tvb_get_ephemeral_string(tvb, offset, len);
|
||||
dcm_setSyntax(di, name);
|
||||
dcm_setSyntax(di, (char*)name);
|
||||
}
|
||||
reply = 0;
|
||||
offset += len;
|
||||
|
|
|
@ -1971,7 +1971,7 @@ dissect_dcom_OBJREF(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
|||
/* add interface instance to database (we currently only handle IPv4) */
|
||||
if(pinfo->net_src.type == AT_IPv4) {
|
||||
dcom_if = dcom_interface_new(pinfo,
|
||||
ip,
|
||||
(guint8*)ip,
|
||||
&iid, oxid, oid, &ipid);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -584,7 +584,7 @@ dissect_dhcpfo_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
format_text(client_identifier_str, option_length));
|
||||
proto_tree_add_string(option_tree,
|
||||
hf_dhcpfo_client_identifier, tvb, offset,
|
||||
option_length, client_identifier_str);
|
||||
option_length, (char*)client_identifier_str);
|
||||
break;
|
||||
|
||||
case DHCP_FO_PD_CLIENT_HARDWARE_ADDRESS:
|
||||
|
@ -661,7 +661,7 @@ dissect_dhcpfo_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
format_text(vendor_class_str, option_length));
|
||||
proto_tree_add_string(option_tree,
|
||||
hf_dhcpfo_vendor_class, tvb, offset,
|
||||
option_length, vendor_class_str);
|
||||
option_length, (char*)vendor_class_str);
|
||||
break;
|
||||
|
||||
case DHCP_FO_PD_LEASE_EXPIRATION_TIME:
|
||||
|
|
|
@ -579,7 +579,7 @@ dhcpv6_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree,
|
|||
status_code);
|
||||
|
||||
if (optlen - 2 > 0) {
|
||||
status_message = tvb_get_ephemeral_string(tvb, off + 2, optlen - 2);
|
||||
status_message = (char*)tvb_get_ephemeral_string(tvb, off + 2, optlen - 2);
|
||||
proto_tree_add_text(subtree, tvb, off + 2, optlen - 2,
|
||||
"Status Message: %s",
|
||||
status_message);
|
||||
|
|
|
@ -1871,7 +1871,7 @@ static void dissect_avps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *avp_tree
|
|||
|
||||
data = tvb_get_ptr(tvb, offset, avpDataLength);
|
||||
proto_tree_add_string_format(avpi_tree, hf_diameter_avp_data_string,
|
||||
tvb, offset, avpDataLength, data,
|
||||
tvb, offset, avpDataLength, (char*)data,
|
||||
"Identity: %*.*s",
|
||||
(int)avpDataLength,
|
||||
(int)avpDataLength, data);
|
||||
|
@ -1883,7 +1883,7 @@ static void dissect_avps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *avp_tree
|
|||
|
||||
data = tvb_get_ptr(tvb, offset, avpDataLength);
|
||||
proto_tree_add_string_format(avpi_tree, hf_diameter_avp_data_string,
|
||||
tvb, offset, avpDataLength, data,
|
||||
tvb, offset, avpDataLength, (char*)data,
|
||||
"UTF8String: %*.*s",
|
||||
(int)avpDataLength,
|
||||
(int)avpDataLength, data);
|
||||
|
|
|
@ -158,7 +158,7 @@ dissect_distcc_argv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int
|
|||
|
||||
|
||||
argv_len=len>255?255:len;
|
||||
tvb_memcpy(tvb, argv, offset, argv_len);
|
||||
tvb_memcpy(tvb, (guint8*)argv, offset, argv_len);
|
||||
argv[argv_len]=0;
|
||||
|
||||
proto_tree_add_item(tree, hf_distcc_argv, tvb, offset, len, FALSE);
|
||||
|
@ -189,7 +189,7 @@ dissect_distcc_serr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int
|
|||
|
||||
|
||||
argv_len=len>255?255:len;
|
||||
tvb_memcpy(tvb, argv, offset, argv_len);
|
||||
tvb_memcpy(tvb, (guint8*)argv, offset, argv_len);
|
||||
argv[argv_len]=0;
|
||||
|
||||
proto_tree_add_item(tree, hf_distcc_serr, tvb, offset, len, FALSE);
|
||||
|
@ -220,7 +220,7 @@ dissect_distcc_sout(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int
|
|||
|
||||
|
||||
argv_len=len>255?255:len;
|
||||
tvb_memcpy(tvb, argv, offset, argv_len);
|
||||
tvb_memcpy(tvb, (guint8*)argv, offset, argv_len);
|
||||
argv[argv_len]=0;
|
||||
|
||||
proto_tree_add_item(tree, hf_distcc_sout, tvb, offset, len, FALSE);
|
||||
|
@ -313,11 +313,11 @@ dissect_distcc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
|
|||
}
|
||||
|
||||
/* read the token */
|
||||
tvb_memcpy(tvb, token, offset, 4);
|
||||
tvb_memcpy(tvb, (guint8*)token, offset, 4);
|
||||
offset+=4;
|
||||
|
||||
/* read the parameter */
|
||||
sscanf(tvb_get_ptr(tvb, offset, 8), "%08x", ¶meter);
|
||||
sscanf((char*)tvb_get_ptr(tvb, offset, 8), "%08x", ¶meter);
|
||||
offset+=8;
|
||||
|
||||
if(!strncmp(token, "DIST", 4)){
|
||||
|
|
|
@ -820,7 +820,7 @@ dissect_dns_query(tvbuff_t *tvb, int offset, int dns_data_offset,
|
|||
* The name might contain octets that aren't printable characters,
|
||||
* format it for display.
|
||||
*/
|
||||
name_out = format_text(name, strlen(name));
|
||||
name_out = format_text((guchar*)name, strlen(name));
|
||||
|
||||
if (cinfo != NULL) {
|
||||
col_append_fstr(cinfo, COL_INFO, " %s %s", type_name, name_out);
|
||||
|
@ -1051,7 +1051,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset,
|
|||
* The name might contain octets that aren't printable characters,
|
||||
* format it for display.
|
||||
*/
|
||||
name_out = format_text(name, strlen(name));
|
||||
name_out = format_text((guchar*)name, strlen(name));
|
||||
if (type != T_OPT) {
|
||||
trr = proto_tree_add_text(dns_tree, tvb, offset,
|
||||
(data_offset - data_start) + data_len,
|
||||
|
@ -1101,7 +1101,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset,
|
|||
int ns_name_len;
|
||||
|
||||
ns_name_len = get_dns_name(tvb, cur_offset, dns_data_offset, &ns_name);
|
||||
name_out = format_text(ns_name, strlen(ns_name));
|
||||
name_out = format_text((guchar*)ns_name, strlen(ns_name));
|
||||
if (cinfo != NULL)
|
||||
col_append_fstr(cinfo, COL_INFO, " %s", name_out);
|
||||
if (dns_tree != NULL) {
|
||||
|
@ -1118,7 +1118,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset,
|
|||
int cname_len;
|
||||
|
||||
cname_len = get_dns_name(tvb, cur_offset, dns_data_offset, &cname);
|
||||
name_out = format_text(cname, strlen(cname));
|
||||
name_out = format_text((guchar*)cname, strlen(cname));
|
||||
if (cinfo != NULL)
|
||||
col_append_fstr(cinfo, COL_INFO, " %s", name_out);
|
||||
if (dns_tree != NULL) {
|
||||
|
@ -1142,7 +1142,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset,
|
|||
guint32 minimum;
|
||||
|
||||
mname_len = get_dns_name(tvb, cur_offset, dns_data_offset, &mname);
|
||||
name_out = format_text(mname, strlen(mname));
|
||||
name_out = format_text((guchar*)mname, strlen(mname));
|
||||
if (cinfo != NULL)
|
||||
col_append_fstr(cinfo, COL_INFO, " %s", name_out);
|
||||
if (dns_tree != NULL) {
|
||||
|
@ -1152,7 +1152,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset,
|
|||
cur_offset += mname_len;
|
||||
|
||||
rname_len = get_dns_name(tvb, cur_offset, dns_data_offset, &rname);
|
||||
name_out = format_text(rname, strlen(rname));
|
||||
name_out = format_text((guchar*)rname, strlen(rname));
|
||||
proto_tree_add_text(rr_tree, tvb, cur_offset, rname_len, "Responsible authority's mailbox: %s",
|
||||
name_out);
|
||||
cur_offset += rname_len;
|
||||
|
@ -1190,7 +1190,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset,
|
|||
int pname_len;
|
||||
|
||||
pname_len = get_dns_name(tvb, cur_offset, dns_data_offset, &pname);
|
||||
name_out = format_text(pname, strlen(pname));
|
||||
name_out = format_text((guchar*)pname, strlen(pname));
|
||||
if (cinfo != NULL)
|
||||
col_append_fstr(cinfo, COL_INFO, " %s", name_out);
|
||||
if (dns_tree != NULL) {
|
||||
|
@ -1323,7 +1323,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset,
|
|||
|
||||
preference = tvb_get_ntohs(tvb, cur_offset);
|
||||
mx_name_len = get_dns_name(tvb, cur_offset + 2, dns_data_offset, &mx_name);
|
||||
name_out = format_text(mx_name, strlen(mx_name));
|
||||
name_out = format_text((guchar*)mx_name, strlen(mx_name));
|
||||
if (cinfo != NULL)
|
||||
col_append_fstr(cinfo, COL_INFO, " %u %s", preference, name_out);
|
||||
if (dns_tree != NULL) {
|
||||
|
@ -1423,7 +1423,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset,
|
|||
signer_name_len = get_dns_name(tvb, cur_offset, dns_data_offset, &signer_name);
|
||||
proto_tree_add_text(rr_tree, tvb, cur_offset, signer_name_len,
|
||||
"Signer's name: %s",
|
||||
format_text(signer_name, strlen(signer_name)));
|
||||
format_text((guchar*)signer_name, strlen(signer_name)));
|
||||
cur_offset += signer_name_len;
|
||||
rr_len -= signer_name_len;
|
||||
|
||||
|
@ -1573,7 +1573,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset,
|
|||
case 3:
|
||||
gw_name_len = get_dns_name(tvb, cur_offset, dns_data_offset, &gw);
|
||||
proto_tree_add_text(rr_tree, tvb, cur_offset, gw_name_len,
|
||||
"Gateway: %s", format_text(gw, strlen(gw)));
|
||||
"Gateway: %s", format_text((guchar*)gw, strlen(gw)));
|
||||
|
||||
cur_offset += gw_name_len;
|
||||
rr_len -= gw_name_len;
|
||||
|
@ -1643,7 +1643,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset,
|
|||
pname="";
|
||||
pname_len = 0;
|
||||
}
|
||||
name_out = format_text(pname, strlen(pname));
|
||||
name_out = format_text((guchar*)pname, strlen(pname));
|
||||
|
||||
if (cinfo != NULL) {
|
||||
col_append_fstr(cinfo, COL_INFO, " %d %s %s",
|
||||
|
@ -1680,7 +1680,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset,
|
|||
|
||||
dname_len = get_dns_name(tvb, cur_offset, dns_data_offset,
|
||||
&dname);
|
||||
name_out = format_text(dname, strlen(dname));
|
||||
name_out = format_text((guchar*)dname, strlen(dname));
|
||||
if (cinfo != NULL)
|
||||
col_append_fstr(cinfo, COL_INFO, " %s", name_out);
|
||||
if (dns_tree != NULL) {
|
||||
|
@ -1742,7 +1742,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset,
|
|||
|
||||
next_domain_name_len = get_dns_name(tvb, cur_offset, dns_data_offset,
|
||||
&next_domain_name);
|
||||
name_out = format_text(next_domain_name, strlen(next_domain_name));
|
||||
name_out = format_text((guchar*)next_domain_name, strlen(next_domain_name));
|
||||
if (cinfo != NULL)
|
||||
col_append_fstr(cinfo, COL_INFO, " %s", name_out);
|
||||
if (dns_tree != NULL) {
|
||||
|
@ -1790,7 +1790,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset,
|
|||
|
||||
next_domain_name_len = get_dns_name(tvb, cur_offset, dns_data_offset,
|
||||
&next_domain_name);
|
||||
name_out = format_text(next_domain_name, strlen(next_domain_name));
|
||||
name_out = format_text((guchar*)next_domain_name, strlen(next_domain_name));
|
||||
if (cinfo != NULL)
|
||||
col_append_fstr(cinfo, COL_INFO, " %s", name_out);
|
||||
if (dns_tree != NULL) {
|
||||
|
@ -1827,7 +1827,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset,
|
|||
|
||||
preference = tvb_get_ntohs(tvb, cur_offset);
|
||||
kx_name_len = get_dns_name(tvb, cur_offset + 2, dns_data_offset, &kx_name);
|
||||
name_out = format_text(kx_name, strlen(kx_name));
|
||||
name_out = format_text((guchar*)kx_name, strlen(kx_name));
|
||||
if (cinfo != NULL)
|
||||
col_append_fstr(cinfo, COL_INFO, " %u %s", preference, name_out);
|
||||
if (dns_tree != NULL) {
|
||||
|
@ -1951,7 +1951,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset,
|
|||
tkey_algname_len = get_dns_name(tvb, cur_offset, dns_data_offset, &tkey_algname);
|
||||
proto_tree_add_text(rr_tree, tvb, cur_offset, tkey_algname_len,
|
||||
"Algorithm name: %s",
|
||||
format_text(tkey_algname, strlen(tkey_algname)));
|
||||
format_text((guchar*)tkey_algname, strlen(tkey_algname)));
|
||||
cur_offset += tkey_algname_len;
|
||||
rr_len -= tkey_algname_len;
|
||||
|
||||
|
@ -2074,7 +2074,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset,
|
|||
|
||||
if (dns_tree != NULL) {
|
||||
tsig_algname_len = get_dns_name(tvb, cur_offset, dns_data_offset, &tsig_raw_algname);
|
||||
tsig_algname=format_text(tsig_raw_algname, strlen(tsig_raw_algname));
|
||||
tsig_algname=format_text((guchar*)tsig_raw_algname, strlen(tsig_raw_algname));
|
||||
proto_tree_add_string(rr_tree, hf_dns_tsig_algorithm_name, tvb, cur_offset, tsig_algname_len, tsig_algname);
|
||||
cur_offset += tsig_algname_len;
|
||||
rr_len -= tsig_algname_len;
|
||||
|
@ -2262,7 +2262,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset,
|
|||
rr_len -= 4;
|
||||
|
||||
dname_len = get_dns_name(tvb, cur_offset, dns_data_offset, &dname);
|
||||
name_out = format_text(dname, strlen(dname));
|
||||
name_out = format_text((guchar*)dname, strlen(dname));
|
||||
if (cinfo != NULL)
|
||||
col_append_fstr(cinfo, COL_INFO, " %s", name_out);
|
||||
if (dns_tree != NULL) {
|
||||
|
@ -2286,7 +2286,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset,
|
|||
port = tvb_get_ntohs(tvb, cur_offset+4);
|
||||
|
||||
target_len = get_dns_name(tvb, cur_offset + 6, dns_data_offset, &target);
|
||||
name_out = format_text(target, strlen(target));
|
||||
name_out = format_text((guchar*)target, strlen(target));
|
||||
if (cinfo != NULL)
|
||||
col_append_fstr(cinfo, COL_INFO, " %u %u %u %s", priority, weight, port, name_out);
|
||||
if (dns_tree != NULL) {
|
||||
|
@ -2322,7 +2322,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset,
|
|||
offset += 2;
|
||||
flags_len = tvb_get_guint8(tvb, offset);
|
||||
offset++;
|
||||
flags = tvb_get_ephemeral_string(tvb, offset, flags_len);
|
||||
flags = (gchar*)tvb_get_ephemeral_string(tvb, offset, flags_len);
|
||||
offset += flags_len;
|
||||
service_len = tvb_get_guint8(tvb, offset);
|
||||
offset++;
|
||||
|
|
|
@ -468,7 +468,7 @@ dissect_dsi_reply_get_status(tvbuff_t *tvb, proto_tree *tree, gint offset)
|
|||
|
||||
ofs = utf_ofs;
|
||||
ulen = tvb_get_ntohs(tvb, ofs);
|
||||
tmp = tvb_get_ephemeral_string(tvb, ofs + 2, ulen);
|
||||
tmp = (char*)tvb_get_ephemeral_string(tvb, ofs + 2, ulen);
|
||||
ti = proto_tree_add_text(tree, tvb, ofs, ulen + 2, "UTF8 server name: %s", tmp);
|
||||
sub_tree = proto_item_add_subtree(ti, ett_dsi_utf8_name);
|
||||
proto_tree_add_uint(sub_tree, hf_dsi_utf8_server_name_len, tvb, ofs, 2, ulen);
|
||||
|
|
|
@ -329,7 +329,7 @@ static guint8 edonkey_metatag_name_get_type(tvbuff_t *tvb, gint start, gint leng
|
|||
if (match_strval(special_tagtype, edonkey_special_tags) == NULL) {
|
||||
gint index;
|
||||
tag_name = tvb_get_ephemeral_string(tvb, start, length);
|
||||
index = lookup_str_index(tag_name, length, edonkey_special_tags);
|
||||
index = lookup_str_index((gchar*)tag_name, length, edonkey_special_tags);
|
||||
if (index < 0)
|
||||
return EDONKEY_STAG_UNKNOWN;
|
||||
else return edonkey_special_tags[index].value;
|
||||
|
|
|
@ -361,9 +361,9 @@ dissect_display_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, p
|
|||
|
||||
display_name = tvb_get_ephemeral_string(tvb, offset, length);
|
||||
proto_item_append_text(display_item, ": \"%s\"",
|
||||
format_text(display_name, strlen(display_name)));
|
||||
format_text(display_name, strlen((char*)display_name)));
|
||||
proto_tree_add_string(display_tree, hf_edp_display_string, tvb, offset, length,
|
||||
display_name);
|
||||
(char*)display_name);
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -552,9 +552,9 @@ dissect_vlan_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, prot
|
|||
|
||||
vlan_name = tvb_get_ephemeral_string(tvb, offset, length);
|
||||
proto_item_append_text(vlan_item, ", Name \"%s\"",
|
||||
format_text(vlan_name, strlen(vlan_name)));
|
||||
format_text(vlan_name, strlen((char*)vlan_name)));
|
||||
proto_tree_add_string(vlan_tree, hf_edp_vlan_name, tvb, offset, length,
|
||||
vlan_name);
|
||||
(char*)vlan_name);
|
||||
offset += length;
|
||||
}
|
||||
|
||||
|
|
|
@ -602,7 +602,7 @@ dissect_fcdns_gspnid (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
|
|||
tvb, offset, 1, 0);
|
||||
proto_tree_add_string (req_tree, hf_fcdns_rply_spname, tvb,
|
||||
offset+1, len,
|
||||
tvb_get_ptr (tvb, offset+1, len));
|
||||
(char*)tvb_get_ptr (tvb, offset+1, len));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1234,7 +1234,7 @@ dissect_fcdns_zone_mbr (tvbuff_t *tvb, proto_tree *zmbr_tree, int offset)
|
|||
3)));
|
||||
break;
|
||||
case FC_SWILS_ZONEMBR_ALIAS:
|
||||
str = zonenm_to_str (tvb, offset+4);
|
||||
str = (char*)zonenm_to_str (tvb, offset+4);
|
||||
proto_tree_add_string (zmbr_tree, hf_fcdns_zone_mbrid, tvb,
|
||||
offset+4, idlen, str);
|
||||
break;
|
||||
|
@ -1452,7 +1452,7 @@ dissect_fcdns_gezn (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
|
|||
proto_tree_add_text (req_tree, tvb, offset, 1, "Name Length: %d",
|
||||
strlen);
|
||||
proto_tree_add_string (req_tree, hf_fcdns_zonenm, tvb, offset+3,
|
||||
strlen, tvb_get_ptr (tvb, offset+3, strlen));
|
||||
strlen, (char*)tvb_get_ptr (tvb, offset+3, strlen));
|
||||
}
|
||||
}
|
||||
else {
|
||||
|
|
|
@ -1260,7 +1260,7 @@ dissect_swils_zone_mbr (tvbuff_t *tvb, proto_tree *zmbr_tree, int offset)
|
|||
3)));
|
||||
break;
|
||||
case FC_SWILS_ZONEMBR_ALIAS:
|
||||
str = zonenm_to_str (tvb, offset+4);
|
||||
str = (char*)zonenm_to_str (tvb, offset+4);
|
||||
proto_tree_add_string (zmbr_tree, hf_swils_zone_mbrid, tvb,
|
||||
offset+4, idlen, str);
|
||||
break;
|
||||
|
@ -1311,7 +1311,7 @@ dissect_swils_zone_obj (tvbuff_t *tvb, proto_tree *zobj_tree, int offset)
|
|||
1, 0);
|
||||
proto_tree_add_item (zobj_tree, hf_swils_zone_protocol, tvb,
|
||||
offset+1, 1, 0);
|
||||
str = zonenm_to_str (tvb, offset+4);
|
||||
str = (char*)zonenm_to_str (tvb, offset+4);
|
||||
proto_tree_add_string (zobj_tree, hf_swils_zone_objname, tvb,
|
||||
offset+4, ZONENAME_LEN (tvb, offset+4), str);
|
||||
|
||||
|
@ -1356,7 +1356,7 @@ dissect_swils_mergereq (tvbuff_t *tvb, proto_tree *mr_tree, guint8 isreq)
|
|||
"Active ZoneSet Length: %u", zonesetlen);
|
||||
|
||||
if (zonesetlen) {
|
||||
str = zonenm_to_str (tvb, offset+4);
|
||||
str = (char*)zonenm_to_str (tvb, offset+4);
|
||||
proto_tree_add_string (mr_tree, hf_swils_zone_activezonenm, tvb,
|
||||
offset+4, ZONENAME_LEN (tvb, offset+4),
|
||||
str);
|
||||
|
@ -1503,7 +1503,7 @@ dissect_swils_sfc (tvbuff_t *tvb, proto_tree *sfc_tree, guint8 isreq)
|
|||
"ZoneSet Length: %d", zonesetlen);
|
||||
|
||||
if (zonesetlen) {
|
||||
str = zonenm_to_str (tvb, offset+4);
|
||||
str = (char*)zonenm_to_str (tvb, offset+4);
|
||||
proto_tree_add_string (sfc_tree, hf_swils_sfc_zonenm, tvb,
|
||||
offset+4, ZONENAME_LEN (tvb, offset+4),
|
||||
str);
|
||||
|
|
|
@ -913,7 +913,7 @@ dissect_fix(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
}
|
||||
|
||||
if (check_col(pinfo->cinfo, COL_INFO)) {
|
||||
value = tvb_get_ephemeral_string(tvb, value_offset, value_len);
|
||||
value = (char*)tvb_get_ephemeral_string(tvb, value_offset, value_len);
|
||||
msg_type = (char *)g_datalist_get_data(&msg_types, value);
|
||||
if(msg_type) {
|
||||
summary_label = g_string_new(msg_type);
|
||||
|
@ -972,10 +972,10 @@ dissect_fix(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
packet. */
|
||||
return TRUE;
|
||||
}
|
||||
tag_str = tvb_get_ephemeral_string(tvb, field_offset, tag_len);
|
||||
tag_str = (char*)tvb_get_ephemeral_string(tvb, field_offset, tag_len);
|
||||
tag = atoi(tag_str);
|
||||
|
||||
value = tvb_get_ephemeral_string(tvb, value_offset, value_len);
|
||||
value = (char*)tvb_get_ephemeral_string(tvb, value_offset, value_len);
|
||||
|
||||
switch(tag) {
|
||||
case 1: /* Field Account */
|
||||
|
|
|
@ -110,7 +110,7 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
|
|||
proto_item *volatile ti = NULL;
|
||||
nstime_t ts;
|
||||
int cap_len = 0, frame_len = 0;
|
||||
proto_tree *tree;
|
||||
proto_tree *volatile tree;
|
||||
proto_item *item;
|
||||
int frame_number;
|
||||
|
||||
|
|
|
@ -315,7 +315,7 @@ dissect_ftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
hf_ftp_request_command, tvb, offset,
|
||||
tokenlen, FALSE);
|
||||
}
|
||||
if (strncmp(line, "PORT", tokenlen) == 0)
|
||||
if (strncmp((char*)line, "PORT", tokenlen) == 0)
|
||||
is_port_request = TRUE;
|
||||
}
|
||||
} else {
|
||||
|
@ -337,7 +337,7 @@ dissect_ftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
* One-line reply, or first or last line
|
||||
* of a multi-line reply.
|
||||
*/
|
||||
tvb_get_nstringz0(tvb, offset, sizeof(code_str), code_str);
|
||||
tvb_get_nstringz0(tvb, offset, sizeof(code_str), (guint8*)code_str);
|
||||
code = strtoul(code_str, NULL, 10);
|
||||
|
||||
if (tree) {
|
||||
|
|
|
@ -170,7 +170,7 @@ dissect_fw1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
iface_len = 6;
|
||||
|
||||
interface_name=ep_alloc(iface_len+1);
|
||||
tvb_get_nstringz0(tvb, 2, iface_len, interface_name);
|
||||
tvb_get_nstringz0(tvb, 2, iface_len, (guint8*)interface_name);
|
||||
|
||||
/* Known interface name - if not, remember it */
|
||||
found=FALSE;
|
||||
|
|
|
@ -173,7 +173,7 @@ dissect_gssapi_work(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
|
|||
proto_item *item;
|
||||
proto_tree *subtree;
|
||||
int return_offset = 0;
|
||||
gssapi_conv_info_t *gss_info;
|
||||
gssapi_conv_info_t *volatile gss_info;
|
||||
gssapi_oid_value *oidvalue;
|
||||
dissector_handle_t handle;
|
||||
conversation_t *conversation;
|
||||
|
|
|
@ -3787,7 +3787,7 @@ decode_qos_umts(tvbuff_t *tvb, int offset, proto_tree *tree, const gchar* qos_st
|
|||
|
||||
static const gchar* dissect_radius_qos_umts(proto_tree *tree, tvbuff_t *tvb) {
|
||||
decode_qos_umts(tvb, 0, tree, "UMTS GTP QoS Profile", 3);
|
||||
return tvb_get_ephemeral_string(tvb,0,tvb_length(tvb));
|
||||
return (gchar*)tvb_get_ephemeral_string(tvb,0,tvb_length(tvb));
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -3810,7 +3810,7 @@ decode_apn(tvbuff_t *tvb, int offset, guint16 length, proto_tree *tree) {
|
|||
} else
|
||||
apn = tvb_get_ephemeral_string(tvb, offset, length);
|
||||
|
||||
proto_tree_add_string (tree, hf_gtp_apn, tvb, offset, length, apn);
|
||||
proto_tree_add_string (tree, hf_gtp_apn, tvb, offset, length, (char*)apn);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -230,7 +230,7 @@ dissect_hsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
offset++;
|
||||
tvb_memcpy(tvb, auth_buf, offset, 8);
|
||||
auth_buf[sizeof auth_buf - 1] = '\0';
|
||||
proto_tree_add_string_format(hsrp_tree, hf_hsrp_auth_data, tvb, offset, 8, auth_buf,
|
||||
proto_tree_add_string_format(hsrp_tree, hf_hsrp_auth_data, tvb, offset, 8, (char*)auth_buf,
|
||||
"Authentication Data: %sDefault (%s)",
|
||||
(tvb_strneql(tvb, offset, "cisco", strlen("cisco"))) == 0 ? "" : "Non-",
|
||||
auth_buf);
|
||||
|
|
|
@ -1203,7 +1203,7 @@ static guint32 dissect_ies (tvbuff_t * tvb, guint32 offset,
|
|||
/* we don't understand this ie: add a generic one */
|
||||
guint32 value;
|
||||
const guint8 *ptr;
|
||||
const guint8 *ie_name = val_to_str(ies_type, iax_ies_type, "Unknown");
|
||||
const guint8 *ie_name = (guint8*)val_to_str(ies_type, iax_ies_type, "Unknown");
|
||||
|
||||
switch(ies_len) {
|
||||
case 1:
|
||||
|
@ -1234,7 +1234,7 @@ static guint32 dissect_ies (tvbuff_t * tvb, guint32 offset,
|
|||
ptr = tvb_get_ptr(tvb, offset + 2, ies_len);
|
||||
ie_item =
|
||||
proto_tree_add_string_format(ies_tree, hf_IAX_IE_UNKNOWN_BYTES,
|
||||
tvb, offset+2, ies_len, ptr,
|
||||
tvb, offset+2, ies_len, (char*)ptr,
|
||||
"%s: %s", ie_name, ptr );
|
||||
break;
|
||||
}
|
||||
|
@ -1258,7 +1258,7 @@ static guint32 dissect_ies (tvbuff_t * tvb, guint32 offset,
|
|||
else {
|
||||
guint8 *ie_val = NULL;
|
||||
ie_val = g_malloc(ITEM_LABEL_LENGTH);
|
||||
proto_item_fill_label(ie_finfo, ie_val);
|
||||
proto_item_fill_label(ie_finfo, (gchar*)ie_val);
|
||||
proto_item_set_text(ti, "Information Element: %s",
|
||||
ie_val);
|
||||
g_free(ie_val);
|
||||
|
|
|
@ -257,7 +257,7 @@ static void dissect_ice_string(proto_tree *tree, int hf_icep,
|
|||
|
||||
|
||||
if ( Size != 0 ) {
|
||||
s = tvb_get_ephemeral_string(tvb, offset, Size);
|
||||
s = (char*)tvb_get_ephemeral_string(tvb, offset, Size);
|
||||
if (tree && add_hf)
|
||||
proto_tree_add_string(tree, hf_icep, tvb, offset, Size, s);
|
||||
} else {
|
||||
|
|
|
@ -200,7 +200,7 @@ dissect_igap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int off
|
|||
}
|
||||
tvb_memcpy(tvb, account, offset, asize);
|
||||
account[asize] = '\0';
|
||||
proto_tree_add_string(tree, hf_account, tvb, offset, asize, account);
|
||||
proto_tree_add_string(tree, hf_account, tvb, offset, asize, (char*)account);
|
||||
}
|
||||
offset += ACCOUNT_SIZE;
|
||||
|
||||
|
|
|
@ -163,7 +163,7 @@ dissect_gif(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
|
|||
guint8 color_resolution;
|
||||
guint8 image_bpp;
|
||||
guint tvb_len = tvb_reported_length(tvb);
|
||||
char *str = tvb_get_ephemeral_string(tvb, 0, 6);
|
||||
char *str = (char*)tvb_get_ephemeral_string(tvb, 0, 6);
|
||||
guint8 version;
|
||||
|
||||
/* Check whether we're processing a GIF object */
|
||||
|
|
|
@ -509,7 +509,7 @@ process_app0_segment(proto_tree *tree, tvbuff_t *tvb, guint32 len,
|
|||
|
||||
proto_tree_add_item(subtree, hf_len, tvb, 2, 2, FALSE);
|
||||
|
||||
str = tvb_get_ephemeral_stringz(tvb, 4, &str_size);
|
||||
str = (char*)tvb_get_ephemeral_stringz(tvb, 4, &str_size);
|
||||
ti = proto_tree_add_item(subtree, hf_identifier, tvb, 4, str_size, FALSE);
|
||||
if (strcmp(str, "JFIF") == 0) {
|
||||
/* Version */
|
||||
|
@ -603,7 +603,7 @@ process_app1_segment(proto_tree *tree, tvbuff_t *tvb, guint32 len,
|
|||
proto_tree_add_item(subtree, hf_len, tvb, offset, 2, FALSE);
|
||||
offset += 2;
|
||||
|
||||
str = tvb_get_ephemeral_stringz(tvb, offset, &str_size);
|
||||
str = (char*)tvb_get_ephemeral_stringz(tvb, offset, &str_size);
|
||||
ti = proto_tree_add_item(subtree, hf_identifier, tvb, offset, str_size, FALSE);
|
||||
offset += str_size;
|
||||
if (strcmp(str, "Exif") == 0) {
|
||||
|
@ -759,7 +759,7 @@ process_app2_segment(proto_tree *tree, tvbuff_t *tvb, guint32 len,
|
|||
|
||||
proto_tree_add_item(subtree, hf_len, tvb, 2, 2, FALSE);
|
||||
|
||||
str = tvb_get_ephemeral_stringz(tvb, 4, &str_size);
|
||||
str = (char*)tvb_get_ephemeral_stringz(tvb, 4, &str_size);
|
||||
ti = proto_tree_add_item(subtree, hf_identifier, tvb, 4, str_size, FALSE);
|
||||
if (strcmp(str, "FPXR") == 0) {
|
||||
proto_tree_add_text(tree, tvb, 0, -1, "Exif FlashPix APP2 application marker");
|
||||
|
|
|
@ -206,7 +206,7 @@ dissect_ipdc_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
/* simple IPDC_ASCII strings */
|
||||
case IPDC_ASCII:
|
||||
g_assert(len<=IPDC_STR_LEN);
|
||||
tvb_memcpy(tvb, tmp_tag_text, offset+2, len);
|
||||
tvb_memcpy(tvb, (guint8*)tmp_tag_text, offset+2, len);
|
||||
tmp_tag_text[len] = 0;
|
||||
proto_tree_add_text(tag_tree, tvb, offset,
|
||||
len + 2, "0x%2.2x: %s: %s", tag, des,
|
||||
|
|
|
@ -480,18 +480,18 @@ add_integer_tree(proto_tree *tree, tvbuff_t *tvb, int offset,
|
|||
* ends in '-time' then assume they are timestamps instead
|
||||
* of integers.
|
||||
*/
|
||||
name_val=tvb_get_ptr(tvb, offset + 1 + 2, name_length);
|
||||
if( (name_length > 5) && name_val && !tvb_memeql(tvb, offset + 1 + 2 + name_length - 5, "-time", 5)){
|
||||
name_val=(char*)tvb_get_ptr(tvb, offset + 1 + 2, name_length);
|
||||
if( (name_length > 5) && name_val && !tvb_memeql(tvb, offset + 1 + 2 + name_length - 5, (guint8*)"-time", 5)){
|
||||
ti = proto_tree_add_text(tree, tvb, offset,
|
||||
1 + 2 + name_length + 2 + value_length,
|
||||
"%s: %s",
|
||||
format_text(name_val, name_length),
|
||||
format_text((guchar*)name_val, name_length),
|
||||
abs_time_secs_to_str(tvb_get_ntohl(tvb, offset + 1 + 2 + name_length + 2)));
|
||||
} else {
|
||||
ti = proto_tree_add_text(tree, tvb, offset,
|
||||
1 + 2 + name_length + 2 + value_length,
|
||||
"%s: %u",
|
||||
format_text(name_val, name_length),
|
||||
format_text((guchar*)name_val, name_length),
|
||||
tvb_get_ntohl(tvb, offset + 1 + 2 + name_length + 2));
|
||||
}
|
||||
}
|
||||
|
@ -620,7 +620,7 @@ add_value_head(const gchar *tag_desc, proto_tree *tree, tvbuff_t *tvb,
|
|||
proto_tree_add_text(tree, tvb, offset, name_length,
|
||||
"Name: %s", format_text(nv, name_length));
|
||||
if(name_val){
|
||||
*name_val=nv;
|
||||
*name_val=(char*)nv;
|
||||
}
|
||||
}
|
||||
offset += name_length;
|
||||
|
|
|
@ -1603,11 +1603,11 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off
|
|||
*/
|
||||
cdb_buf=ep_alloc(16+ahs_cdb_length);
|
||||
/* the 16 first bytes of the cdb */
|
||||
tvb_memcpy(tvb, cdb_buf, cdb_offset, 16);
|
||||
tvb_memcpy(tvb, (guint8*)cdb_buf, cdb_offset, 16);
|
||||
/* the remainder of the cdb from the ahs */
|
||||
tvb_memcpy(tvb, cdb_buf+16, ahs_cdb_offset, ahs_cdb_length);
|
||||
tvb_memcpy(tvb, (guint8*)cdb_buf+16, ahs_cdb_offset, ahs_cdb_length);
|
||||
|
||||
cdb_tvb = tvb_new_real_data(cdb_buf,
|
||||
cdb_tvb = tvb_new_real_data((guint8*)cdb_buf,
|
||||
ahs_cdb_length+16,
|
||||
ahs_cdb_length+16);
|
||||
|
||||
|
|
|
@ -441,7 +441,7 @@ static gboolean dissect_jxta_UDP_heur(tvbuff_t * tvb, packet_info * pinfo, proto
|
|||
if (!gUDP_HEUR)
|
||||
return FALSE;
|
||||
|
||||
if (tvb_memeql(tvb, 0, JXTA_UDP_SIG, sizeof(JXTA_UDP_SIG)) != 0) {
|
||||
if (tvb_memeql(tvb, 0, (guint8*)JXTA_UDP_SIG, sizeof(JXTA_UDP_SIG)) != 0) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
@ -633,7 +633,7 @@ static int dissect_jxta_udp(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tr
|
|||
break;
|
||||
}
|
||||
|
||||
if (tvb_memeql(tvb, offset, JXTA_UDP_SIG, sizeof(JXTA_UDP_SIG)) != 0) {
|
||||
if (tvb_memeql(tvb, offset, (guint8*)JXTA_UDP_SIG, sizeof(JXTA_UDP_SIG)) != 0) {
|
||||
/* not ours */
|
||||
return 0;
|
||||
}
|
||||
|
@ -761,7 +761,7 @@ static int dissect_jxta_stream(tvbuff_t * tvb, packet_info * pinfo, proto_tree *
|
|||
goto Common_Exit;
|
||||
}
|
||||
|
||||
if (0 == tvb_memeql(tvb, 0, JXTA_WELCOME_MSG_SIG, sizeof(JXTA_WELCOME_MSG_SIG))) {
|
||||
if (0 == tvb_memeql(tvb, 0, (guint8*)JXTA_WELCOME_MSG_SIG, sizeof(JXTA_WELCOME_MSG_SIG))) {
|
||||
/* The beginning of a JXTA stream connection */
|
||||
address *welcome_addr;
|
||||
gboolean initiator = FALSE;
|
||||
|
@ -1030,7 +1030,7 @@ static int dissect_jxta_welcome(tvbuff_t * tvb, packet_info * pinfo, proto_tree
|
|||
return (gint) (available - sizeof(JXTA_WELCOME_MSG_SIG));
|
||||
}
|
||||
|
||||
if (0 != tvb_memeql(tvb, 0, JXTA_WELCOME_MSG_SIG, sizeof(JXTA_WELCOME_MSG_SIG))) {
|
||||
if (0 != tvb_memeql(tvb, 0, (guint8*)JXTA_WELCOME_MSG_SIG, sizeof(JXTA_WELCOME_MSG_SIG))) {
|
||||
/* not ours! */
|
||||
return 0;
|
||||
}
|
||||
|
@ -1058,7 +1058,7 @@ static int dissect_jxta_welcome(tvbuff_t * tvb, packet_info * pinfo, proto_tree
|
|||
}
|
||||
|
||||
{
|
||||
gchar *welcomeline = tvb_get_ephemeral_string(tvb, offset, first_linelen);
|
||||
gchar *welcomeline = (char*)tvb_get_ephemeral_string(tvb, offset, first_linelen);
|
||||
gchar **current_token;
|
||||
guint token_offset = offset;
|
||||
proto_item *jxta_welcome_tree_item = NULL;
|
||||
|
@ -1134,7 +1134,7 @@ static int dissect_jxta_welcome(tvbuff_t * tvb, packet_info * pinfo, proto_tree
|
|||
found_addr->type = AT_URI;
|
||||
found_addr->len = strlen(*current_token);
|
||||
/* FIXME 20050605 bondolo THIS ALLOCATION IS A MEMORY LEAK! */
|
||||
found_addr->data = g_strdup(*current_token);
|
||||
found_addr->data = (guint8*)g_strdup(*current_token);
|
||||
}
|
||||
|
||||
token_offset += strlen(*current_token) + 1;
|
||||
|
@ -1292,7 +1292,7 @@ static int dissect_jxta_message_framing(tvbuff_t * tvb, packet_info * pinfo, pro
|
|||
|
||||
if (content_type && (sizeof("content-type") - 1) == headername_len) {
|
||||
if (0 == tvb_strncaseeql(tvb, headername_offset, "content-type", sizeof("content-type") - 1)) {
|
||||
*content_type = tvb_get_ephemeral_string(tvb, headervalue_offset, headervalue_len);
|
||||
*content_type = (gchar*)tvb_get_ephemeral_string(tvb, headervalue_offset, headervalue_len);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1402,7 +1402,7 @@ static int dissect_jxta_message(tvbuff_t * tvb, packet_info * pinfo, proto_tree
|
|||
break;
|
||||
}
|
||||
|
||||
if (tvb_memeql(tvb, offset, JXTA_MSG_SIG, sizeof(JXTA_MSG_SIG)) != 0) {
|
||||
if (tvb_memeql(tvb, offset, (guint8*)JXTA_MSG_SIG, sizeof(JXTA_MSG_SIG)) != 0) {
|
||||
/* It is not one of ours */
|
||||
return 0;
|
||||
}
|
||||
|
@ -1618,7 +1618,7 @@ static int dissect_jxta_message(tvbuff_t * tvb, packet_info * pinfo, proto_tree
|
|||
for (each_name = 0; each_name < msg_names_count; each_name++) {
|
||||
guint16 name_len = tvb_get_ntohs(tvb, tree_offset);
|
||||
|
||||
names_table[2 + each_name] = tvb_get_ephemeral_string(tvb, tree_offset + sizeof(name_len), name_len);
|
||||
names_table[2 + each_name] = (gchar*)tvb_get_ephemeral_string(tvb, tree_offset + sizeof(name_len), name_len);
|
||||
proto_tree_add_item(jxta_msg_tree, hf_jxta_message_names_name, tvb, tree_offset, sizeof(name_len), FALSE);
|
||||
tree_offset += sizeof(name_len) + name_len;
|
||||
}
|
||||
|
@ -1689,7 +1689,7 @@ static int dissect_jxta_message_element_1(tvbuff_t * tvb, packet_info * pinfo, p
|
|||
needed = (gint) (sizeof(JXTA_MSGELEM_SIG) - available);
|
||||
}
|
||||
|
||||
if (tvb_memeql(tvb, offset, JXTA_MSGELEM_SIG, sizeof(JXTA_MSGELEM_SIG)) != 0) {
|
||||
if (tvb_memeql(tvb, offset, (guint8*)JXTA_MSGELEM_SIG, sizeof(JXTA_MSGELEM_SIG)) != 0) {
|
||||
/* It is not one of ours */
|
||||
return 0;
|
||||
}
|
||||
|
@ -1873,7 +1873,7 @@ static int dissect_jxta_message_element_1(tvbuff_t * tvb, packet_info * pinfo, p
|
|||
proto_tree_add_item(jxta_elem_tree, hf_jxta_element_type, tvb, tree_offset, sizeof(guint16), FALSE);
|
||||
tree_offset += sizeof(guint16);
|
||||
|
||||
mediatype = tvb_get_ephemeral_string(tvb, tree_offset, type_len);
|
||||
mediatype = (gchar*)tvb_get_ephemeral_string(tvb, tree_offset, type_len);
|
||||
|
||||
/* remove any params */
|
||||
{
|
||||
|
@ -1990,7 +1990,7 @@ static int dissect_jxta_message_element_2(tvbuff_t * tvb, packet_info * pinfo, p
|
|||
needed = (gint) (sizeof(JXTA_MSGELEM_SIG) - available);
|
||||
}
|
||||
|
||||
if (tvb_memeql(tvb, offset, JXTA_MSGELEM_SIG, sizeof(JXTA_MSGELEM_SIG)) != 0) {
|
||||
if (tvb_memeql(tvb, offset, (guint8*)JXTA_MSGELEM_SIG, sizeof(JXTA_MSGELEM_SIG)) != 0) {
|
||||
/* It is not one of ours */
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue