From b78ec5269315ff54b7643df9e5deb8a574224bb2 Mon Sep 17 00:00:00 2001 From: Bill Meier Date: Fri, 5 Nov 2010 22:44:03 +0000 Subject: Use value_string_ext fcns to access certain value_string arrays; Sort certain value_string arrays so the values are in ascending order; Use val_to_str_ext() instead of for loops to do value_string array lookups (voip_calls.c). Minor whitespace cleanup. svn path=/trunk/; revision=34794 --- epan/dissectors/packet-q931.h | 102 +++++++++++++++++++++--------------------- 1 file changed, 51 insertions(+), 51 deletions(-) (limited to 'epan/dissectors/packet-q931.h') diff --git a/epan/dissectors/packet-q931.h b/epan/dissectors/packet-q931.h index 1485ec2b68..fc234d69b6 100644 --- a/epan/dissectors/packet-q931.h +++ b/epan/dissectors/packet-q931.h @@ -42,14 +42,14 @@ extern void dissect_q931_high_layer_compat_ie(tvbuff_t *, int, int, extern void dissect_q931_user_user_ie(tvbuff_t *tvb, packet_info *pinfo, int offset, int len, proto_tree *tree); -extern const value_string q931_cause_location_vals[]; +extern value_string_ext q931_cause_location_vals_ext; typedef struct _q931_packet_info { gchar *calling_number; gchar *called_number; guint8 cause_value; gint32 crv; - guint8 message_type; + guint8 message_type; } q931_packet_info; /* @@ -57,65 +57,65 @@ typedef struct _q931_packet_info { * without having to duplicate it. With MSVC and a * libwireshark.dll, we need a special declaration. */ -WS_VAR_IMPORT const value_string q931_cause_code_vals[]; +WS_VAR_IMPORT value_string_ext q931_cause_code_vals_ext; WS_VAR_IMPORT const value_string q931_message_type_vals[]; -extern const value_string q931_protocol_discriminator_vals[]; -extern const value_string q931_progress_description_vals[]; -extern const value_string q931_call_state_vals[]; +extern value_string_ext q931_protocol_discriminator_vals_ext; +extern value_string_ext q931_progress_description_vals_ext; +extern value_string_ext q931_call_state_vals_ext; /* * Q.931 message types. */ -#define Q931_ESCAPE 0x00 -#define Q931_ALERTING 0x01 -#define Q931_CALL_PROCEEDING 0x02 -#define Q931_CONNECT 0x07 -#define Q931_CONNECT_ACK 0x0F -#define Q931_PROGRESS 0x03 -#define Q931_SETUP 0x05 -#define Q931_SETUP_ACK 0x0D -#define Q931_HOLD 0x24 -#define Q931_HOLD_ACK 0x28 -#define Q931_HOLD_REJECT 0x30 -#define Q931_RESUME 0x26 -#define Q931_RESUME_ACK 0x2E -#define Q931_RESUME_REJECT 0x22 -#define Q931_RETRIEVE 0x31 -#define Q931_RETRIEVE_ACK 0x33 -#define Q931_RETRIEVE_REJECT 0x37 -#define Q931_SUSPEND 0x25 -#define Q931_SUSPEND_ACK 0x2D -#define Q931_SUSPEND_REJECT 0x21 -#define Q931_USER_INFORMATION 0x20 -#define Q931_DETACH 0x40 -#define Q931_DETACH_ACKNOWLEDGE 0x48 -#define Q931_DISCONNECT 0x45 -#define Q931_RELEASE 0x4D -#define Q931_RELEASE_COMPLETE 0x5A -#define Q931_RESTART 0x46 -#define Q931_RESTART_ACK 0x4E -#define Q931_CONGESTION_CONTROL 0x79 -#define Q931_FACILITY 0x62 -#define Q931_FACILITY_ACKNOWLEDGE 0x6A -#define Q931_FACILITY_REJECT 0x72 -#define Q931_INFORMATION 0x7B -#define Q931_NOTIFY 0x6E -#define Q931_REGISTER 0x64 -#define Q931_SEGMENT 0x60 -#define Q931_STATUS 0x7D -#define Q931_STATUS_ENQUIRY 0x75 -#define Q931_VERSION 0x0a -#define Q931_GROUIP_SERVICE 0x06 -#define Q931_GROUIP_SERVICE_ACK 0x0b -#define Q931_RESYNC_REQ 0x08 -#define Q931_RESYNC_RESP 0x09 +#define Q931_ESCAPE 0x00 +#define Q931_ALERTING 0x01 +#define Q931_CALL_PROCEEDING 0x02 +#define Q931_PROGRESS 0x03 +#define Q931_SETUP 0x05 +#define Q931_GROUIP_SERVICE 0x06 +#define Q931_CONNECT 0x07 +#define Q931_RESYNC_REQ 0x08 +#define Q931_RESYNC_RESP 0x09 +#define Q931_VERSION 0x0A +#define Q931_GROUIP_SERVICE_ACK 0x0B +#define Q931_SETUP_ACK 0x0D +#define Q931_CONNECT_ACK 0x0F +#define Q931_USER_INFORMATION 0x20 +#define Q931_SUSPEND_REJECT 0x21 +#define Q931_RESUME_REJECT 0x22 +#define Q931_HOLD 0x24 +#define Q931_SUSPEND 0x25 +#define Q931_RESUME 0x26 +#define Q931_HOLD_ACK 0x28 +#define Q931_SUSPEND_ACK 0x2D +#define Q931_RESUME_ACK 0x2E +#define Q931_HOLD_REJECT 0x30 +#define Q931_RETRIEVE 0x31 +#define Q931_RETRIEVE_ACK 0x33 +#define Q931_RETRIEVE_REJECT 0x37 +#define Q931_DETACH 0x40 +#define Q931_DISCONNECT 0x45 +#define Q931_RESTART 0x46 +#define Q931_DETACH_ACKNOWLEDGE 0x48 +#define Q931_RELEASE 0x4D +#define Q931_RESTART_ACK 0x4E +#define Q931_RELEASE_COMPLETE 0x5A +#define Q931_SEGMENT 0x60 +#define Q931_FACILITY 0x62 +#define Q931_REGISTER 0x64 +#define Q931_FACILITY_ACKNOWLEDGE 0x6A +#define Q931_NOTIFY 0x6E +#define Q931_FACILITY_REJECT 0x72 +#define Q931_STATUS_ENQUIRY 0x75 +#define Q931_CONGESTION_CONTROL 0x79 +#define Q931_INFORMATION 0x7B +#define Q931_STATUS 0x7D /* * Maintenance message types. * AT&T TR41459, Nortel NIS A211-1, Telcordia SR-4994, ... */ -#define DMS_SERVICE_ACKNOWLEDGE 0x07 -#define DMS_SERVICE 0x0F +#define DMS_SERVICE_ACKNOWLEDGE 0x07 +#define DMS_SERVICE 0x0F #endif -- cgit v1.2.3