aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asn1/h225/h225.cnf8
-rw-r--r--asn1/h245/h245.cnf14
-rw-r--r--epan/dissectors/packet-h225.c8
-rw-r--r--epan/dissectors/packet-h245.c14
-rw-r--r--epan/dissectors/packet-per.c9
-rw-r--r--epan/proto.h2
6 files changed, 29 insertions, 26 deletions
diff --git a/asn1/h225/h225.cnf b/asn1/h225/h225.cnf
index 86b373b53a..142f648d28 100644
--- a/asn1/h225/h225.cnf
+++ b/asn1/h225/h225.cnf
@@ -213,7 +213,7 @@ CallIdentifier/guid guid
if (h225_pi->is_destinationInfo == TRUE) {
if (value_tvb) {
len = tvb_length(value_tvb);
- tvb_memcpy(value_tvb, h225_pi->dialedDigits, 0, len);
+ tvb_memcpy(value_tvb, (guint8*)h225_pi->dialedDigits, 0, len);
}
h225_pi->dialedDigits[len] = '\0';
h225_pi->is_destinationInfo = FALSE;
@@ -223,10 +223,12 @@ CallIdentifier/guid guid
#.FN_PARS H245TransportAddress/h245ipAddress/h245ipv4
VAL_PTR = &value_tvb
#.FN_BODY H245TransportAddress/h245ipAddress/h245ipv4
- tvbuff_t *value_tvb;
+ tvbuff_t *value_tvb;
+ ipv4_address = 0;
%(DEFAULT_BODY)s
- tvb_memcpy(value_tvb, (char *)&ipv4_address, 0, 4);
+ if (value_tvb)
+ tvb_memcpy(value_tvb, (guint8*)&ipv4_address, 0, 4);
#.END
#----------------------------------------------------------------------------------------
#.FN_PARS H245TransportAddress/h245ipAddress/h245ipv4port
diff --git a/asn1/h245/h245.cnf b/asn1/h245/h245.cnf
index 162c8b4a21..1b7f77e942 100644
--- a/asn1/h245/h245.cnf
+++ b/asn1/h245/h245.cnf
@@ -276,14 +276,14 @@ OpenLogicalChannel
VAL_PTR = &value_tvb
#.FN_BODY UnicastAddress/iPAddress/network
- tvbuff_t *value_tvb;
+ tvbuff_t *value_tvb;
%(DEFAULT_BODY)s
if ( media_channel )
- tvb_memcpy(value_tvb, (char *)&ipv4_address, 0, 4);
+ tvb_memcpy(value_tvb, (guint8*)&ipv4_address, 0, 4);
if ( media_control_channel )
- tvb_memcpy(value_tvb, (char *)&rtcp_ipv4_address, 0, 4);
+ tvb_memcpy(value_tvb, (guint8*)&rtcp_ipv4_address, 0, 4);
#.END
#----------------------------------------------------------------------------------------
@@ -364,7 +364,7 @@ OpenLogicalChannel
src_addr.type=AT_IPv4;
src_addr.len=4;
- src_addr.data=(char *)&ipv4_address;
+ src_addr.data=(guint8*)&ipv4_address;
rtp_add_address(pinfo, &src_addr, ipv4_port, 0, "H245", pinfo->fd->num, NULL);
}
@@ -373,7 +373,7 @@ OpenLogicalChannel
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_ipv4_port, 0, "H245", pinfo->fd->num);
}
@@ -394,7 +394,7 @@ OpenLogicalChannel
src_addr.type=AT_IPv4;
src_addr.len=4;
- src_addr.data=(char *)&ipv4_address;
+ src_addr.data=(guint8*)&ipv4_address;
rtp_add_address(pinfo, &src_addr, ipv4_port, 0, "H245", pinfo->fd->num, NULL);
}
@@ -403,7 +403,7 @@ OpenLogicalChannel
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_ipv4_port, 0, "H245", pinfo->fd->num);
}
diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c
index d3966d321b..027715961e 100644
--- a/epan/dissectors/packet-h225.c
+++ b/epan/dissectors/packet-h225.c
@@ -1212,12 +1212,14 @@ static int dissect_protocolIdentifier(tvbuff_t *tvb, int offset, packet_info *pi
static int
dissect_h225_T_h245ipv4(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
- tvbuff_t *value_tvb;
+ tvbuff_t *value_tvb;
+ ipv4_address = 0;
offset = dissect_per_octet_string(tvb, offset, pinfo, tree, hf_index,
4, 4, &value_tvb);
- tvb_memcpy(value_tvb, (char *)&ipv4_address, 0, 4);
+ if (value_tvb)
+ tvb_memcpy(value_tvb, (guint8*)&ipv4_address, 0, 4);
return offset;
}
@@ -2244,7 +2246,7 @@ dissect_h225_DialedDigits(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, pro
if (h225_pi->is_destinationInfo == TRUE) {
if (value_tvb) {
len = tvb_length(value_tvb);
- tvb_memcpy(value_tvb, h225_pi->dialedDigits, 0, len);
+ tvb_memcpy(value_tvb, (guint8*)h225_pi->dialedDigits, 0, len);
}
h225_pi->dialedDigits[len] = '\0';
h225_pi->is_destinationInfo = FALSE;
diff --git a/epan/dissectors/packet-h245.c b/epan/dissectors/packet-h245.c
index 6a717f6671..748b175f65 100644
--- a/epan/dissectors/packet-h245.c
+++ b/epan/dissectors/packet-h245.c
@@ -9587,16 +9587,16 @@ static int dissect_v76LogicalChannelParameters(tvbuff_t *tvb, int offset, packet
static int
dissect_h245_Ipv4_network(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
- tvbuff_t *value_tvb;
+ tvbuff_t *value_tvb;
offset = dissect_per_octet_string(tvb, offset, pinfo, tree, hf_index,
4, 4, &value_tvb);
if ( media_channel )
- tvb_memcpy(value_tvb, (char *)&ipv4_address, 0, 4);
+ tvb_memcpy(value_tvb, (guint8*)&ipv4_address, 0, 4);
if ( media_control_channel )
- tvb_memcpy(value_tvb, (char *)&rtcp_ipv4_address, 0, 4);
+ tvb_memcpy(value_tvb, (guint8*)&rtcp_ipv4_address, 0, 4);
return offset;
@@ -10176,7 +10176,7 @@ dissect_h245_OLC_rev_multiplexParameters(tvbuff_t *tvb, int offset, packet_info
src_addr.type=AT_IPv4;
src_addr.len=4;
- src_addr.data=(char *)&ipv4_address;
+ src_addr.data=(guint8*)&ipv4_address;
rtp_add_address(pinfo, &src_addr, ipv4_port, 0, "H245", pinfo->fd->num, NULL);
}
@@ -10185,7 +10185,7 @@ dissect_h245_OLC_rev_multiplexParameters(tvbuff_t *tvb, int offset, packet_info
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_ipv4_port, 0, "H245", pinfo->fd->num);
}
@@ -12959,7 +12959,7 @@ dissect_h245_T_forwardMultiplexAckParameters(tvbuff_t *tvb, int offset, packet_i
src_addr.type=AT_IPv4;
src_addr.len=4;
- src_addr.data=(char *)&ipv4_address;
+ src_addr.data=(guint8*)&ipv4_address;
rtp_add_address(pinfo, &src_addr, ipv4_port, 0, "H245", pinfo->fd->num, NULL);
}
@@ -12968,7 +12968,7 @@ dissect_h245_T_forwardMultiplexAckParameters(tvbuff_t *tvb, int offset, packet_i
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_ipv4_port, 0, "H245", pinfo->fd->num);
}
diff --git a/epan/dissectors/packet-per.c b/epan/dissectors/packet-per.c
index 14adc2a7a4..af33564de9 100644
--- a/epan/dissectors/packet-per.c
+++ b/epan/dissectors/packet-per.c
@@ -292,7 +292,7 @@ dissect_per_restricted_character_string_sorted(tvbuff_t *tvb, guint32 offset, pa
{
guint32 length;
gboolean byte_aligned;
- char *buf;
+ guint8 *buf;
guint char_pos;
int bits_per_char;
guint32 old_offset;
@@ -405,7 +405,7 @@ DEBUG_ENTRY("dissect_per_restricted_character_string");
}
}
buf[char_pos]=0;
- proto_tree_add_string(tree, hf_index, tvb, (old_offset>>3), (offset>>3)-(old_offset>>3), buf);
+ proto_tree_add_string(tree, hf_index, tvb, (old_offset>>3), (offset>>3)-(old_offset>>3), (char*)buf);
if (value_tvb) {
*value_tvb = tvb_new_real_data(buf, length, length);
tvb_set_free_cb(*value_tvb, g_free);
@@ -542,7 +542,6 @@ DEBUG_ENTRY("dissect_per_constrained_sequence_of");
/* 19.6 ub>=64k or unset */
if(max_len>=65536){
- guint32 start_offset=offset;
/* semi-constrained whole number for number of elements */
/* each element encoded as 10.9 */
offset=dissect_per_length_determinant(tvb, offset, pinfo, parent_tree, hf_per_sequence_of_length, &length);
@@ -1473,11 +1472,11 @@ DEBUG_ENTRY("dissect_per_octet_string");
it = proto_tree_add_uint(tree, hf_index, tvb, val_start, val_length, val_length);
else
it = proto_tree_add_int(tree, hf_index, tvb, val_start, val_length, val_length);
- proto_item_append_text(it, (val_length == 1) ? " octet" : " octets");
+ proto_item_append_text(it, plurality(val_length, " octet", " octets"));
} else {
if (pbytes) {
if(IS_FT_STRING(hfi->type)){
- proto_tree_add_string(tree, hf_index, tvb, val_start, val_length, pbytes);
+ proto_tree_add_string(tree, hf_index, tvb, val_start, val_length, (char*)pbytes);
} else if (hfi->type==FT_BYTES) {
proto_tree_add_bytes(tree, hf_index, tvb, val_start, val_length, pbytes);
} else {
diff --git a/epan/proto.h b/epan/proto.h
index f6944be66d..950687810f 100644
--- a/epan/proto.h
+++ b/epan/proto.h
@@ -143,7 +143,7 @@ typedef enum {
BASE_HEX, /**< hexadecimal */
BASE_OCT, /**< octal */
BASE_DEC_HEX, /**< decimal (hexadecimal) */
- BASE_HEX_DEC, /**< hexadecimal (decimal) */
+ BASE_HEX_DEC /**< hexadecimal (decimal) */
} base_display_e;
#define IS_BASE_DUAL(b) ((b)==BASE_DEC_HEX||(b)==BASE_HEX_DEC)
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 18:46:08 +0000