From a86c5f7cae7ec9a3398300555a0b644689d946a1 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 19 Sep 2024 06:14:53 +0200 Subject: Merging upstream version 4.4.0. Signed-off-by: Daniel Baumann --- epan/dissectors/asn1/t38/packet-t38-template.h | 42 +++++++++++++------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'epan/dissectors/asn1/t38/packet-t38-template.h') diff --git a/epan/dissectors/asn1/t38/packet-t38-template.h b/epan/dissectors/asn1/t38/packet-t38-template.h index 82ff1483..fa316867 100644 --- a/epan/dissectors/asn1/t38/packet-t38-template.h +++ b/epan/dissectors/asn1/t38/packet-t38-template.h @@ -17,17 +17,17 @@ #define MAX_T38_DESC 128 typedef struct _t38_packet_info { - guint16 seq_num; /* UDPTLPacket sequence number */ - gint32 type_msg; /* 0=t30-indicator 1=data */ - guint32 t30ind_value; - guint32 data_value; /* standard and speed */ - guint32 setup_frame_number; - guint32 Data_Field_field_type_value; - guint8 t30_Facsimile_Control; - gchar desc[MAX_T38_DESC]; /* Description used to be displayed in the frame label Graph Anlaysis */ - gchar desc_comment[MAX_T38_DESC]; /* Description used to be displayed in the Comment Graph Anlaysis */ + uint16_t seq_num; /* UDPTLPacket sequence number */ + int32_t type_msg; /* 0=t30-indicator 1=data */ + uint32_t t30ind_value; + uint32_t data_value; /* standard and speed */ + uint32_t setup_frame_number; + uint32_t Data_Field_field_type_value; + uint8_t t30_Facsimile_Control; + char desc[MAX_T38_DESC]; /* Description used to be displayed in the frame label Graph Analysis */ + char desc_comment[MAX_T38_DESC]; /* Description used to be displayed in the Comment Graph Analysis */ double time_first_t4_data; - guint32 frame_num_first_t4_data; + uint32_t frame_num_first_t4_data; } t38_packet_info; @@ -39,16 +39,16 @@ typedef struct _t38_conv_info t38_conv_info; struct _t38_conv_info { - guint32 reass_ID; + uint32_t reass_ID; int reass_start_seqnum; - guint32 reass_start_data_field; - guint32 reass_data_type; - gint32 last_seqnum; /* used to avoid duplicated seq num shown in the Graph Analysis */ - guint32 packet_lost; - guint32 burst_lost; + uint32_t reass_start_data_field; + uint32_t reass_data_type; + int32_t last_seqnum; /* used to avoid duplicated seq num shown in the Graph Analysis */ + uint32_t packet_lost; + uint32_t burst_lost; double time_first_t4_data; - guint32 additional_hdlc_data_field_counter; - gint32 seqnum_prev_data_field; + uint32_t additional_hdlc_data_field_counter; + int32_t seqnum_prev_data_field; t38_conv_info *next; }; @@ -56,8 +56,8 @@ struct _t38_conv_info { /* Info to save the State to reassemble Data (e.g. HDLC) and the Setup (e.g. SDP) in T38 conversations */ typedef struct _t38_conv { - gchar setup_method[MAX_T38_SETUP_METHOD_SIZE + 1]; - guint32 setup_frame_number; + char setup_method[MAX_T38_SETUP_METHOD_SIZE + 1]; + uint32_t setup_frame_number; t38_conv_info src_t38_info; t38_conv_info dst_t38_info; } t38_conv; @@ -67,7 +67,7 @@ WS_DLL_PUBLIC void t38_add_address(packet_info *pinfo, address *addr, int port, int other_port, - const gchar *setup_method, guint32 setup_frame_number); + const char *setup_method, uint32_t setup_frame_number); #include "packet-t38-exp.h" -- cgit v1.2.3