diff options
29 files changed, 80 insertions, 86 deletions
diff --git a/epan/dissectors/packet-ans.c b/epan/dissectors/packet-ans.c index bd2c791d99..213c0a9735 100644 --- a/epan/dissectors/packet-ans.c +++ b/epan/dissectors/packet-ans.c @@ -73,7 +73,7 @@ dissect_ans(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *ans_tree = NULL; guint16 sender_id; guint32 seq_num; - gchar team_id[6]; + guint8 team_id[6]; if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "Intel ANS probe"); diff --git a/epan/dissectors/packet-ap1394.c b/epan/dissectors/packet-ap1394.c index c64eb3e761..c7b130203e 100644 --- a/epan/dissectors/packet-ap1394.c +++ b/epan/dissectors/packet-ap1394.c @@ -64,7 +64,7 @@ dissect_ap1394(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_item *ti; proto_tree *fh_tree = NULL; - const char *src_addr, *dst_addr; + const guint8 *src_addr, *dst_addr; guint16 etype; if (check_col(pinfo->cinfo, COL_PROTOCOL)) diff --git a/epan/dissectors/packet-aruba-adp.c b/epan/dissectors/packet-aruba-adp.c index a23fdf3870..1103462709 100644 --- a/epan/dissectors/packet-aruba-adp.c +++ b/epan/dissectors/packet-aruba-adp.c @@ -60,8 +60,8 @@ dissect_aruba_adp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *ti = NULL; proto_tree *aruba_adp_tree = NULL; guint16 type; - const char *src_mac; - const char *switchip; + const guint8 *src_mac; + const guint8 *switchip; if (check_col(pinfo->cinfo, COL_PROTOCOL)) diff --git a/epan/dissectors/packet-beep.c b/epan/dissectors/packet-beep.c index 7e9a38dbee..87ef60278c 100644 --- a/epan/dissectors/packet-beep.c +++ b/epan/dissectors/packet-beep.c @@ -47,7 +47,7 @@ void proto_reg_handoff_beep(void); -static int global_beep_tcp_port = TCP_PORT_BEEP; +static guint global_beep_tcp_port = TCP_PORT_BEEP; static int global_beep_strict_term = TRUE; static int proto_beep = -1; @@ -96,7 +96,7 @@ static int ett_mime_header = -1; static int ett_header = -1; static int ett_trailer = -1; -static unsigned int tcp_port = 0; +static guint tcp_port = 0; /* Get the state of the more flag ... */ diff --git a/epan/dissectors/packet-bssap.c b/epan/dissectors/packet-bssap.c index 9722874054..62576a547d 100644 --- a/epan/dissectors/packet-bssap.c +++ b/epan/dissectors/packet-bssap.c @@ -139,7 +139,7 @@ static dissector_table_t bsap_dissector_table; */ static guint8 pdu_type = 0xFF; -static guint bssap_or_bsap_global = BSSAP_OR_BSAP_DEFAULT; +static gint bssap_or_bsap_global = BSSAP_OR_BSAP_DEFAULT; static void diff --git a/epan/dissectors/packet-bssgp.c b/epan/dissectors/packet-bssgp.c index 38013c4c6b..6e9cbf5b1d 100644 --- a/epan/dissectors/packet-bssgp.c +++ b/epan/dissectors/packet-bssgp.c @@ -8,12 +8,6 @@ * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * - * Copied from WHATEVER_FILE_YOU_USED (where "WHATEVER_FILE_YOU_USED" - * is a dissector file; if you just copied this from README.developer, - * don't bother with the "Copied from" - you don't even need to put - * in a "Copied from" if you copied an existing dissector, especially - * if the bulk of the code in the new dissector is your code) - * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 @@ -57,7 +51,7 @@ #define BSSGP_NOT_DECODED "< Not decoded yet >" #define BSSGP_UNKNOWN -1 static int bssgp_decode_nri = 0; -static int bssgp_nri_length = 4; +static guint bssgp_nri_length = 4; static dissector_handle_t bssgp_handle; static dissector_handle_t llc_handle; @@ -1240,7 +1234,7 @@ decode_nri(proto_tree *tf, build_info_t *bi, guint32 tmsi_tlli) { const guint32 FOREIGN_TLLI_MASK = 0x80000000; guint16 nri; - if (bssgp_decode_nri && (bssgp_nri_length > 0) && + if (bssgp_decode_nri && (bssgp_nri_length != 0) && (((tmsi_tlli & LOCAL_TLLI_MASK) == LOCAL_TLLI_MASK) || ((tmsi_tlli & FOREIGN_TLLI_MASK) == FOREIGN_TLLI_MASK))) { nri = get_masked_guint32(tmsi_tlli, make_mask32( (guint8) bssgp_nri_length, 8)); diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c index 64106cad71..76278f4db4 100644 --- a/epan/dissectors/packet-cip.c +++ b/epan/dissectors/packet-cip.c @@ -361,11 +361,11 @@ static const value_string cip_class_names_vals[] = { static proto_item* add_byte_array_text_to_proto_tree( proto_tree *tree, tvbuff_t *tvb, gint start, gint length, const char* str ) { - const char *tmp; - char *tmp2, *tmp2start; - proto_item *pi; - int i,tmp_length,tmp2_length; - guint32 octet; + const guint8 *tmp; + char *tmp2, *tmp2start; + proto_item *pi; + int i,tmp_length,tmp2_length; + guint32 octet; /* At least one version of Apple's C compiler/linker is buggy, causing a complaint from the linker about the "literal C string section" not ending with '\0' if we initialize a 16-element "char" array with diff --git a/epan/dissectors/packet-clnp.c b/epan/dissectors/packet-clnp.c index 8f4b051313..594408a51d 100644 --- a/epan/dissectors/packet-clnp.c +++ b/epan/dissectors/packet-clnp.c @@ -1591,7 +1591,7 @@ static int ositp_decode_ER(tvbuff_t *tvb, int offset, guint8 li, guint8 tpdu, { proto_tree *cotp_tree; proto_item *ti; - guchar *str; + char *str; guint16 dst_ref; if (li > LI_MAX_ER) diff --git a/epan/dissectors/packet-echo.c b/epan/dissectors/packet-echo.c index b90883041b..c5dc08b6e9 100644 --- a/epan/dissectors/packet-echo.c +++ b/epan/dissectors/packet-echo.c @@ -49,11 +49,11 @@ static gint ett_echo = -1; static void dissect_echo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - proto_tree *echo_tree = NULL; - proto_item *ti; - int offset = 0; - gboolean request = FALSE; - const char *data = tvb_get_ptr(tvb, offset, -1); + proto_tree *echo_tree = NULL; + proto_item *ti; + int offset = 0; + gboolean request = FALSE; + const guint8 *data = tvb_get_ptr(tvb, offset, -1); if (pinfo->destport == ECHO_PORT) { request = TRUE; diff --git a/epan/dissectors/packet-enc.c b/epan/dissectors/packet-enc.c index 1fc1aa8197..7929084511 100644 --- a/epan/dissectors/packet-enc.c +++ b/epan/dissectors/packet-enc.c @@ -60,10 +60,10 @@ struct enchdr { static dissector_handle_t data_handle, ip_handle, ipv6_handle; /* header fields */ -static unsigned int proto_enc = -1; -static unsigned int hf_enc_af = -1; -static unsigned int hf_enc_spi = -1; -static unsigned int hf_enc_flags = -1; +static int proto_enc = -1; +static int hf_enc_af = -1; +static int hf_enc_spi = -1; +static int hf_enc_flags = -1; static gint ett_enc = -1; diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c index d0dfa6667e..a50f3e89a9 100644 --- a/epan/dissectors/packet-eth.c +++ b/epan/dissectors/packet-eth.c @@ -167,7 +167,7 @@ dissect_eth_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, eth_hdr *volatile ehdr; volatile gboolean is_802_2; proto_tree *volatile fh_tree = NULL; - const char *src_addr, *dst_addr; + const guint8 *src_addr, *dst_addr; static eth_hdr ehdrs[4]; static int ehdr_num=0; proto_tree *volatile tree; diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c index c893e815b9..d228998a6b 100644 --- a/epan/dissectors/packet-gtp.c +++ b/epan/dissectors/packet-gtp.c @@ -56,9 +56,9 @@ static dissector_table_t ppp_subdissector_table; #define GTP_OPTIONAL 2 #define GTP_CONDITIONAL 4 -static int g_gtpv0_port = GTPv0_PORT; -static int g_gtpv1c_port = GTPv1C_PORT; -static int g_gtpv1u_port = GTPv1U_PORT; +static guint g_gtpv0_port = GTPv0_PORT; +static guint g_gtpv1c_port = GTPv1C_PORT; +static guint g_gtpv1u_port = GTPv1U_PORT; void proto_reg_handoff_gtp(void); @@ -207,9 +207,9 @@ static gint ett_gtp_priv_ext = -1; static gboolean gtp_tpdu = TRUE; static gboolean gtp_over_tcp = TRUE; static gboolean gtp_etsi_order = FALSE; -static int gtpv0_port = 0; -static int gtpv1c_port = 0; -static int gtpv1u_port = 0; +static guint gtpv0_port = 0; +static guint gtpv1c_port = 0; +static guint gtpv1u_port = 0; /* Definition of flags masks */ #define GTP_VER_MASK 0xE0 @@ -4607,7 +4607,7 @@ proto_reg_handoff_gtp(void) } ip_handle = find_dissector("ip"); - ipv6_handle = find_dissector("ipv6"); + ipv6_handle = find_dissector("ipv6"); ppp_handle = find_dissector("ppp"); data_handle = find_dissector("data"); gtpcdr_handle = find_dissector("gtpcdr"); diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index cde982e2f2..6de066b6ac 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -87,7 +87,7 @@ static GHashTable *wlan_fragment_table = NULL; static GHashTable *wlan_reassembled_table = NULL; /* Stuff for the WEP decoder */ -static guint num_wepkeys = 0; +static gint num_wepkeys = 0; static guint8 **wep_keys = NULL; static int *wep_keylens = NULL; static void init_wepkeys(void); @@ -3467,7 +3467,7 @@ static tvbuff_t *try_decrypt_wep(tvbuff_t *tvb, guint32 offset, guint32 len) { return NULL; /* krap! */ /* try once with the key index in the packet, then look through our list. */ - for (i = -1; i < (int) num_wepkeys; i++) { + for (i = -1; i < num_wepkeys; i++) { /* copy the encrypted data over to the tmp buffer */ #if 0 printf("trying %d\n", i); @@ -3514,7 +3514,7 @@ static int wep_decrypt(guint8 *buf, guint32 len, int key_override) { if (key_override >= 0) keyidx = key_override; - if (keyidx >= num_wepkeys) + if (keyidx >= (guint)num_wepkeys) return -1; keylen = wep_keylens[keyidx]; @@ -3584,7 +3584,7 @@ static int wep_decrypt(guint8 *buf, guint32 len, int key_override) { static void init_wepkeys(void) { char *tmp; - guint i; + int i; GByteArray *bytes; gboolean res; diff --git a/epan/dissectors/packet-igmp.c b/epan/dissectors/packet-igmp.c index 4f32440c7b..890c234043 100644 --- a/epan/dissectors/packet-igmp.c +++ b/epan/dissectors/packet-igmp.c @@ -452,7 +452,7 @@ dissect_v3_group_record(tvbuff_t *tvb, proto_tree *parent_tree, int offset) tvb_memcpy(tvb, (guint8 *)&ip, offset+4, 4); item = proto_tree_add_text(parent_tree, tvb, offset, -1, "Group Record : %s %s", - ip_to_str((gchar*)&ip), + ip_to_str((guint8*)&ip), val_to_str(tvb_get_guint8(tvb, offset), vs_record_type,"") ); tree = proto_item_add_subtree(item, ett_group_record); diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c index ae62651662..36dd768ce6 100644 --- a/epan/dissectors/packet-ip.c +++ b/epan/dissectors/packet-ip.c @@ -556,7 +556,7 @@ dissect_ipopt_timestamp(const ip_tcp_opt *optp, tvbuff_t *tvb, "(suboption would go past end of option)"); break; } - tvb_memcpy(tvb, (char *)&addr, offset + optoffset, sizeof(addr)); + tvb_memcpy(tvb, (guint8 *)&addr, offset + optoffset, sizeof(addr)); ts = tvb_get_ntohl(tvb, offset + optoffset + 4); optlen -= 8; proto_tree_add_text(field_tree, tvb, offset + optoffset, 8, diff --git a/epan/dissectors/packet-ipdc.c b/epan/dissectors/packet-ipdc.c index dfdf38d3cb..be4a01fae6 100644 --- a/epan/dissectors/packet-ipdc.c +++ b/epan/dissectors/packet-ipdc.c @@ -61,7 +61,7 @@ static gint ett_ipdc = -1; static gint ett_ipdc_tag = -1; static gboolean ipdc_desegment = TRUE; -static gint ipdc_port_pref = TCP_PORT_IPDC; +static guint ipdc_port_pref = TCP_PORT_IPDC; static gboolean new_packet = FALSE; static dissector_handle_t q931_handle; @@ -429,7 +429,7 @@ proto_register_ipdc(void) void proto_reg_handoff_ipdc(void) { - static gint last_ipdc_port_pref = 0; + static guint last_ipdc_port_pref = 0; static dissector_handle_t ipdc_tcp_handle = NULL; if (ipdc_tcp_handle) { diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c index 89b9a7f8c8..f092eeca94 100644 --- a/epan/dissectors/packet-ipv6.c +++ b/epan/dissectors/packet-ipv6.c @@ -210,8 +210,8 @@ dissect_routing6(tvbuff_t *tvb, int offset, proto_tree *tree) { struct ip6_rthdr rt; guint len; proto_tree *rthdr_tree; - proto_item *ti; - char buf[sizeof(struct ip6_rthdr0) + sizeof(struct e_in6_addr) * 23]; + proto_item *ti; + guint8 buf[sizeof(struct ip6_rthdr0) + sizeof(struct e_in6_addr) * 23]; tvb_memcpy(tvb, (guint8 *)&rt, offset, sizeof(rt)); len = (rt.ip6r_len + 1) << 3; diff --git a/epan/dissectors/packet-iscsi.c b/epan/dissectors/packet-iscsi.c index eaeea6995d..f0cc2b5d80 100644 --- a/epan/dissectors/packet-iscsi.c +++ b/epan/dissectors/packet-iscsi.c @@ -79,7 +79,7 @@ static int enableDataDigests = FALSE; static int dataDigestIsCRC32 = TRUE; -static int dataDigestSize = 4; +static guint dataDigestSize = 4; static guint iscsi_port = 3260; diff --git a/epan/dissectors/packet-lmp.c b/epan/dissectors/packet-lmp.c index 5297f2b8a2..7dc51b05f7 100644 --- a/epan/dissectors/packet-lmp.c +++ b/epan/dissectors/packet-lmp.c @@ -63,8 +63,8 @@ static int proto_lmp = -1; #define UDP_PORT_LMP_DEFAULT 701 -static int lmp_udp_port = UDP_PORT_LMP_DEFAULT; -static int lmp_udp_port_config = UDP_PORT_LMP_DEFAULT; +static guint lmp_udp_port = UDP_PORT_LMP_DEFAULT; +static guint lmp_udp_port_config = UDP_PORT_LMP_DEFAULT; static dissector_handle_t lmp_handle; diff --git a/epan/dissectors/packet-m2pa.c b/epan/dissectors/packet-m2pa.c index b1ee17f4e1..ce1be95a63 100644 --- a/epan/dissectors/packet-m2pa.c +++ b/epan/dissectors/packet-m2pa.c @@ -43,8 +43,8 @@ #define NETWORK_BYTE_ORDER FALSE #define SCTP_PORT_M2PA 3565 -static int global_sctp_port = SCTP_PORT_M2PA; -static int sctp_port = 0; +static guint global_sctp_port = SCTP_PORT_M2PA; +static guint sctp_port = 0; void proto_reg_handoff_m2pa(void); diff --git a/epan/dissectors/packet-manolito.c b/epan/dissectors/packet-manolito.c index 302bbf4f84..0648e8d01f 100644 --- a/epan/dissectors/packet-manolito.c +++ b/epan/dissectors/packet-manolito.c @@ -39,11 +39,11 @@ /* Initialize the protocol and registered fields */ static int proto_manolito = -1; -static guint32 hf_manolito_checksum = -1; -static guint32 hf_manolito_seqno = -1; -static guint32 hf_manolito_src = -1; -static guint32 hf_manolito_dest = -1; -static guint32 hf_manolito_options = -1; +static int hf_manolito_checksum = -1; +static int hf_manolito_seqno = -1; +static int hf_manolito_src = -1; +static int hf_manolito_dest = -1; +static int hf_manolito_options = -1; /* Initialize the subtree pointers */ static gint ett_manolito = -1; diff --git a/epan/dissectors/packet-nlm.c b/epan/dissectors/packet-nlm.c index d5056529ea..5727c0622a 100644 --- a/epan/dissectors/packet-nlm.c +++ b/epan/dissectors/packet-nlm.c @@ -108,7 +108,7 @@ typedef struct _nlm_msg_res_unmatched_data { int req_frame; nstime_t ns; int cookie_len; - const char *cookie; + const guint8 *cookie; } nlm_msg_res_unmatched_data; typedef struct _nlm_msg_res_matched_data { @@ -168,7 +168,7 @@ nlm_msg_res_unmatched_equal(gconstpointer k1, gconstpointer k2) return 0; } - return( !memcmp(umd1->cookie, umd2->cookie, umd1->cookie_len)); + return( memcmp(umd1->cookie, umd2->cookie, umd1->cookie_len) == 0); } static gint nlm_msg_res_matched_equal(gconstpointer k1, gconstpointer k2) @@ -271,7 +271,7 @@ nlm_register_unmatched_res(packet_info *pinfo, tvbuff_t *tvb, int offset) nlm_msg_res_unmatched_data *old_umd; umd.cookie_len=tvb_get_ntohl(tvb, offset); - umd.cookie=(const char *)tvb_get_ptr(tvb, offset+4, -1); + umd.cookie=tvb_get_ptr(tvb, offset+4, -1); /* have we seen this cookie before? */ old_umd=g_hash_table_lookup(nlm_msg_res_unmatched, (gconstpointer)&umd); diff --git a/epan/dissectors/packet-nsip.c b/epan/dissectors/packet-nsip.c index beca1fa042..526a985a2f 100644 --- a/epan/dissectors/packet-nsip.c +++ b/epan/dissectors/packet-nsip.c @@ -46,10 +46,10 @@ #define NSIP_SEP ", " /* Separator string */ #define NSIP_LITTLE_ENDIAN 0 -static int nsip_udp_port1 = NSIP_UDP_PORT1; -static int nsip_udp_port2 = NSIP_UDP_PORT2; -static int global_nsip_udp_port1 = NSIP_UDP_PORT1; -static int global_nsip_udp_port2 = NSIP_UDP_PORT2; +static guint nsip_udp_port1 = NSIP_UDP_PORT1; +static guint nsip_udp_port2 = NSIP_UDP_PORT2; +static guint global_nsip_udp_port1 = NSIP_UDP_PORT1; +static guint global_nsip_udp_port2 = NSIP_UDP_PORT2; void proto_reg_handoff_nsip(void); diff --git a/epan/dissectors/packet-pgm.c b/epan/dissectors/packet-pgm.c index f38381b3a5..cab0d4a7bc 100644 --- a/epan/dissectors/packet-pgm.c +++ b/epan/dissectors/packet-pgm.c @@ -346,10 +346,10 @@ typedef struct { #define DEFAULT_UDP_ENCAP_UCAST_PORT 3055 #define DEFAULT_UDP_ENCAP_MCAST_PORT 3056 -static int udp_encap_ucast_port = 0; -static int udp_encap_mcast_port = 0; -static int old_encap_ucast_port = 0; -static int old_encap_mcast_port = 0; +static guint udp_encap_ucast_port = 0; +static guint udp_encap_mcast_port = 0; +static guint old_encap_ucast_port = 0; +static guint old_encap_mcast_port = 0; static int proto_pgm = -1; static int ett_pgm = -1; diff --git a/epan/dissectors/packet-rdt.c b/epan/dissectors/packet-rdt.c index 00e77c6d05..30744477fe 100644 --- a/epan/dissectors/packet-rdt.c +++ b/epan/dissectors/packet-rdt.c @@ -169,11 +169,11 @@ static gint ett_rdt_bw_probing_flags = -1; /* Port preference settings */ static gboolean global_rdt_register_udp_port = FALSE; -static gint global_rdt_udp_port = 6970; +static guint global_rdt_udp_port = 6970; /* Also store this so can delete registered setting properly */ static gboolean rdt_register_udp_port = FALSE; -static gint rdt_udp_port = 0; +static guint rdt_udp_port = 0; void proto_reg_handoff_rdt(void); diff --git a/epan/dissectors/packet-retix-bpdu.c b/epan/dissectors/packet-retix-bpdu.c index 7ed45b7cf8..8cd7b35050 100644 --- a/epan/dissectors/packet-retix-bpdu.c +++ b/epan/dissectors/packet-retix-bpdu.c @@ -63,7 +63,7 @@ dissect_retix_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree *retix_bpdu_tree; proto_tree *ti; - const char *bridge_mac_str; + const guint8 *bridge_mac_str; if (check_col(pinfo->cinfo, COL_PROTOCOL)) { col_set_str(pinfo->cinfo, COL_PROTOCOL, "R-STP"); diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c index 56b8a63309..712474c583 100644 --- a/epan/dissectors/packet-rpc.c +++ b/epan/dissectors/packet-rpc.c @@ -240,7 +240,7 @@ static dissector_handle_t rpc_handle; static dissector_handle_t gssapi_handle; static dissector_handle_t data_handle; -static int max_rpc_tcp_pdu_size = 262144; +static guint max_rpc_tcp_pdu_size = 262144; static const fragment_items rpc_frag_items = { &ett_rpc_fragment, @@ -2801,7 +2801,7 @@ dissect_rpc_fragment(tvbuff_t *tvb, int offset, packet_info *pinfo, struct tcpinfo *tcpinfo; guint32 seq; guint32 rpc_rm; - volatile gint32 len; + volatile guint32 len; gint32 seglen; gint tvb_len, tvb_reported_len; tvbuff_t *frag_tvb; @@ -2850,7 +2850,7 @@ dissect_rpc_fragment(tvbuff_t *tvb, int offset, packet_info *pinfo, if (rpc_desegment) { seglen = tvb_length_remaining(tvb, offset + 4); - if (len > seglen && pinfo->can_desegment) { + if ((gint)len > seglen && pinfo->can_desegment) { /* * This frame doesn't have all of the * data for this message, but we can do @@ -2889,9 +2889,9 @@ dissect_rpc_fragment(tvbuff_t *tvb, int offset, packet_info *pinfo, len += 4; /* include record mark */ tvb_len = tvb_length_remaining(tvb, offset); tvb_reported_len = tvb_reported_length_remaining(tvb, offset); - if (tvb_len > len) + if (tvb_len > (gint)len) tvb_len = len; - if (tvb_reported_len > len) + if (tvb_reported_len > (gint)len) tvb_reported_len = len; frag_tvb = tvb_new_subset(tvb, offset, tvb_len, tvb_reported_len); diff --git a/epan/dissectors/packet-skinny.c b/epan/dissectors/packet-skinny.c index c9942a433f..fca4ccbc07 100644 --- a/epan/dissectors/packet-skinny.c +++ b/epan/dissectors/packet-skinny.c @@ -1392,8 +1392,8 @@ static void dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr src_addr.type=AT_IPv4; src_addr.len=4; - src_addr.data=(char *)&ipv4_address; - tvb_memcpy(tvb, (char *)&ipv4_address, offset+16, 4); + src_addr.data=(guint8 *)&ipv4_address; + tvb_memcpy(tvb, (guint8 *)&ipv4_address, offset+16, 4); rtp_add_address(pinfo, &src_addr, tvb_get_letohl(tvb, offset+20), 0, "Skinny", pinfo->fd->num, NULL); } break; diff --git a/epan/dissectors/packet-uma.c b/epan/dissectors/packet-uma.c index d86ca47093..e882f7a80b 100644 --- a/epan/dissectors/packet-uma.c +++ b/epan/dissectors/packet-uma.c @@ -1215,7 +1215,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) if ( octet == 0x57 ){ /* IPv6 */ }else{ /* All other values shall be interpreted as Ipv4 address in this version of the protocol.*/ - tvb_memcpy(tvb, (char *)&sgw_ipv4_address, ie_offset, 4); + tvb_memcpy(tvb, (guint8 *)&sgw_ipv4_address, ie_offset, 4); proto_tree_add_ipv4(urr_ie_tree, hf_uma_urr_sgw_ipv4, tvb, ie_offset, 4, sgw_ipv4_address); } @@ -1707,7 +1707,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) if ( octet == 0x57 ){ /* IPv6 */ }else{ /* All other values shall be interpreted as Ipv4 address in this version of the protocol.*/ - tvb_memcpy(tvb, (char *)&unc_ipv4_address, ie_offset, 4); + tvb_memcpy(tvb, (guint8 *)&unc_ipv4_address, ie_offset, 4); proto_tree_add_ipv4(urr_ie_tree, hf_uma_urr_unc_ipv4, tvb, ie_offset, 4, unc_ipv4_address); rtp_ipv4_address = unc_ipv4_address; @@ -1732,7 +1732,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) if ( octet == 0x57 ){ /* IPv6 */ }else{ /* All other values shall be interpreted as Ipv4 address in this version of the protocol.*/ - tvb_memcpy(tvb, (char *)&GPRS_user_data_ipv4_address, ie_offset, 4); + tvb_memcpy(tvb, (guint8 *)&GPRS_user_data_ipv4_address, ie_offset, 4); proto_tree_add_ipv4(urr_ie_tree, hf_uma_urr_GPRS_user_data_transport_ipv4, tvb, ie_offset, 4, GPRS_user_data_ipv4_address); } @@ -1753,7 +1753,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) dst_addr.type=AT_IPv4; dst_addr.len=4; - dst_addr.data=(char *)&GPRS_user_data_ipv4_address; + dst_addr.data=(guint8 *)&GPRS_user_data_ipv4_address; conversation = find_conversation(pinfo->fd->num,&dst_addr, &null_addr, PT_UDP, GPRS_user_data_transport_UDP_port, @@ -1787,7 +1787,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) dst_addr.type=AT_IPv4; dst_addr.len=4; - dst_addr.data=(char *)&unc_ipv4_address; + dst_addr.data=(guint8 *)&unc_ipv4_address; conversation = find_conversation(pinfo->fd->num,&dst_addr, &null_addr, PT_TCP, UNC_tcp_port, @@ -1817,7 +1817,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) src_addr.type=AT_IPv4; src_addr.len=4; - src_addr.data=(char *)&rtp_ipv4_address; + src_addr.data=(guint8 *)&rtp_ipv4_address; rtp_add_address(pinfo, &src_addr, RTP_UDP_port, 0, "UMA", pinfo->fd->num, 0); if ((RTP_UDP_port & 0x1) == 0){ /* Even number RTP port RTCP should follow on odd number */ @@ -1835,7 +1835,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) src_addr.type=AT_IPv4; src_addr.len=4; - src_addr.data=(char *)&rtcp_ipv4_address; + src_addr.data=(guint8 *)&rtcp_ipv4_address; rtcp_add_address(pinfo, &src_addr, RTCP_UDP_port, 0, "UMA", pinfo->fd->num); } |