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

1 files changed, 122 insertions, 121 deletions

diff --git a/epan/dissectors/packet-isup.h b/epan/dissectors/packet-isup.h
index 136a28edd1..436721f458 100644
--- a/epan/dissectors/packet-isup.h
+++ b/epan/dissectors/packet-isup.h
@@ -27,144 +27,145 @@
 #ifndef PACKET_ISUP_H
 #define PACKET_ISUP_H
 
-#define	ISUP_MAX_NUM_MESSAGE_TYPES	256
+#define ISUP_MAX_NUM_MESSAGE_TYPES  256
 
 typedef struct _isup_tap_rec_t {
-    guint8		message_type;
+    guint8      message_type;
     /* added for VoIP calls analysis, see gtk/voip_calls.c*/
     gchar           *called_number;
     gchar           *calling_number;
-    guint8			cause_value;
+    guint8          cause_value;
 } isup_tap_rec_t;
 
 
 /*
  * the following allows TAP code access to the messages
- * without having to duplicate it. With MSVC and a 
+ * without having to duplicate it. With MSVC and a
  * libwireshark.dll, we need a special declaration.
  */
-WS_VAR_IMPORT const value_string isup_message_type_value[];
-WS_VAR_IMPORT const value_string isup_message_type_value_acro[];
-WS_VAR_IMPORT const value_string q850_cause_code_vals[];
+WS_VAR_IMPORT value_string_ext isup_message_type_value_acro_ext;
+WS_VAR_IMPORT value_string_ext q850_cause_code_vals_ext;
 /*
  * Export some definitions and value_string tables for other dissectors
  */
 
 /* Definition of Parameter Types */
-#define PARAM_TYPE_END_OF_OPT_PARAMS      0
-#define PARAM_TYPE_CALL_REF               1
-#define PARAM_TYPE_TRANSM_MEDIUM_REQU     2
-#define PARAM_TYPE_ACC_TRANSP             3
-#define PARAM_TYPE_CALLED_PARTY_NR        4
-#define PARAM_TYPE_SUBSQT_NR              5
-#define PARAM_TYPE_NATURE_OF_CONN_IND     6
-#define PARAM_TYPE_FORW_CALL_IND          7
-#define PARAM_TYPE_OPT_FORW_CALL_IND      8
-#define PARAM_TYPE_CALLING_PRTY_CATEG     9
-#define PARAM_TYPE_CALLING_PARTY_NR      10
-#define PARAM_TYPE_REDIRECTING_NR        11
-#define PARAM_TYPE_REDIRECTION_NR        12
-#define PARAM_TYPE_CONNECTION_REQ        13
-#define PARAM_TYPE_INFO_REQ_IND          14
-#define PARAM_TYPE_INFO_IND              15
-#define PARAM_TYPE_CONTINUITY_IND        16
-#define PARAM_TYPE_BACKW_CALL_IND        17
-#define PARAM_TYPE_CAUSE_INDICATORS      18
-#define PARAM_TYPE_REDIRECTION_INFO      19
-#define PARAM_TYPE_CIRC_GRP_SV_MSG_TYPE  21
-#define PARAM_TYPE_RANGE_AND_STATUS      22
-#define PARAM_TYPE_FACILITY_IND          24
-#define PARAM_TYPE_CLSD_USR_GRP_ILOCK_CD 26
-#define PARAM_TYPE_USER_SERVICE_INFO     29
-#define PARAM_TYPE_SIGNALLING_POINT_CODE 30
-#define PARAM_TYPE_USER_TO_USER_INFO     32
-#define PARAM_TYPE_CONNECTED_NR          33
-#define PARAM_TYPE_SUSP_RESUME_IND       34
-#define PARAM_TYPE_TRANSIT_NETW_SELECT   35
-#define PARAM_TYPE_EVENT_INFO            36
-#define PARAM_TYPE_CIRC_ASSIGN_MAP       37
-#define PARAM_TYPE_CIRC_STATE_IND        38
-#define PARAM_TYPE_AUTO_CONG_LEVEL       39
-#define PARAM_TYPE_ORIG_CALLED_NR        40
-#define PARAM_TYPE_OPT_BACKW_CALL_IND    41
-#define PARAM_TYPE_USER_TO_USER_IND      42
-#define PARAM_TYPE_ORIG_ISC_POINT_CODE   43
-#define PARAM_TYPE_GENERIC_NOTIF_IND     44
-#define PARAM_TYPE_CALL_HIST_INFO        45
-#define PARAM_TYPE_ACC_DELIV_INFO        46
-#define PARAM_TYPE_NETW_SPECIFIC_FACLTY  47
-#define PARAM_TYPE_USER_SERVICE_INFO_PR  48
-#define PARAM_TYPE_PROPAG_DELAY_COUNTER  49
-#define PARAM_TYPE_REMOTE_OPERATIONS     50
-#define PARAM_TYPE_SERVICE_ACTIVATION    51
-#define PARAM_TYPE_USER_TELESERV_INFO    52
-#define PARAM_TYPE_TRANSM_MEDIUM_USED    53
-#define PARAM_TYPE_CALL_DIV_INFO         54
-#define PARAM_TYPE_ECHO_CTRL_INFO        55
-#define PARAM_TYPE_MSG_COMPAT_INFO       56
-#define PARAM_TYPE_PARAM_COMPAT_INFO     57
-#define PARAM_TYPE_MLPP_PRECEDENCE       58
-#define PARAM_TYPE_MCID_REQ_IND          59
-#define PARAM_TYPE_MCID_RSP_IND          60
-#define PARAM_TYPE_HOP_COUNTER           61
-#define PARAM_TYPE_TRANSM_MEDIUM_RQUR_PR 62
-#define PARAM_TYPE_LOCATION_NR           63
-#define PARAM_TYPE_REDIR_NR_RSTRCT       64
-#define PARAM_TYPE_CALL_TRANS_REF        67
-#define PARAM_TYPE_LOOP_PREV_IND         68
-#define PARAM_TYPE_CALL_TRANS_NR         69
-#define PARAM_TYPE_CCSS                  75
-#define PARAM_TYPE_FORW_GVNS             76
-#define PARAM_TYPE_BACKW_GVNS            77
-#define PARAM_TYPE_REDIRECT_CAPAB        78
-#define PARAM_TYPE_NETW_MGMT_CTRL        91
-#define PARAM_TYPE_CORRELATION_ID       101
-#define PARAM_TYPE_SCF_ID               102
-#define PARAM_TYPE_CALL_DIV_TREAT_IND   110
-#define PARAM_TYPE_CALLED_IN_NR         111
-#define PARAM_TYPE_CALL_OFF_TREAT_IND   112
-#define PARAM_TYPE_CHARGED_PARTY_IDENT  113
-#define PARAM_TYPE_CONF_TREAT_IND       114
-#define PARAM_TYPE_DISPLAY_INFO         115
-#define PARAM_TYPE_UID_ACTION_IND       116
-#define PARAM_TYPE_UID_CAPAB_IND        117
-#define PARAM_TYPE_REDIRECT_COUNTER     119
-#define PARAM_TYPE_APPLICATON_TRANS		120
-#define PARAM_TYPE_COLLECT_CALL_REQ     121
-#define PARAM_TYPE_CALLING_GEODETIC_LOCATION    129		/* ANSI is the same */
-#define PARAM_TYPE_GENERIC_NR           192
-#define PARAM_TYPE_GENERIC_DIGITS       193
-#define PARAM_TYPE_JURISDICTION			196
-#define PARAM_TYPE_GENERIC_NAME			199
-#define PARAM_TYPE_ORIG_LINE_INFO		234
-#define PARAM_TYPE_CHARGE_NR			235
-
-#define ANSI_ISUP_PARAM_TYPE_OPER_SERV_INF	0xC2
-#define ANSI_ISUP_PARAM_TYPE_EGRESS			0xC3
-#define ANSI_ISUP_PARAM_TYPE_JURISDICTION	0xC4
-#define ANSI_ISUP_PARAM_TYPE_CARRIER_ID		0xC5
-#define ANSI_ISUP_PARAM_TYPE_BUSINESS_GRP	0xC6
-#define ANSI_ISUP_PARAM_TYPE_GENERIC_NAME	0xC7
-#define ANSI_ISUP_PARAM_TYPE_NOTIF_IND		0xE1
-
-#define ANSI_ISUP_PARAM_TYPE_CG_CHAR_IND			229
-#define ANSI_ISUP_PARAM_TYPE_CVR_RESP_IND			230
-#define	ANSI_ISUP_PARAM_TYPE_OUT_TRK_GRP_NM			231	
-#define ANSI_ISUP_PARAM_TYPE_CI_NAME_IND			232
-#define ANSI_ISUP_PARAM_CLLI_CODE					233
-
-#define ANSI_ISUP_PARAM_ORIG_LINE_INF				0xEA
-#define ANSI_ISUP_PARAM_CHRG_NO						0xEB
-#define ANSI_ISUP_PARAM_SERV_CODE_IND				0xEC
-#define ANSI_ISUP_PARAM_SPEC_PROC_REQ				0xED
-#define ANSI_ISUP_PARAM_CARRIER_SEL_INF				0xEE
-#define ANSI_ISUP_PARAM_NET_TRANS					0xEF
-
-extern const value_string isup_parameter_type_value[]; 
-extern const value_string isup_transmission_medium_requirement_value[];
-WS_VAR_IMPORT const value_string isup_calling_partys_category_value[];
-extern const value_string bearer_network_connection_characteristics_vals[];
-extern const value_string x213_afi_value[];
+#define PARAM_TYPE_END_OF_OPT_PARAMS            0
+#define PARAM_TYPE_CALL_REF                     1
+#define PARAM_TYPE_TRANSM_MEDIUM_REQU           2
+#define PARAM_TYPE_ACC_TRANSP                   3
+#define PARAM_TYPE_CALLED_PARTY_NR              4
+#define PARAM_TYPE_SUBSQT_NR                    5
+#define PARAM_TYPE_NATURE_OF_CONN_IND           6
+#define PARAM_TYPE_FORW_CALL_IND                7
+#define PARAM_TYPE_OPT_FORW_CALL_IND            8
+#define PARAM_TYPE_CALLING_PRTY_CATEG           9
+#define PARAM_TYPE_CALLING_PARTY_NR            10
+#define PARAM_TYPE_REDIRECTING_NR              11
+#define PARAM_TYPE_REDIRECTION_NR              12
+#define PARAM_TYPE_CONNECTION_REQ              13
+#define PARAM_TYPE_INFO_REQ_IND                14
+#define PARAM_TYPE_INFO_IND                    15
+#define PARAM_TYPE_CONTINUITY_IND              16
+#define PARAM_TYPE_BACKW_CALL_IND              17
+#define PARAM_TYPE_CAUSE_INDICATORS            18
+#define PARAM_TYPE_REDIRECTION_INFO            19
+#define PARAM_TYPE_CIRC_GRP_SV_MSG_TYPE        21
+#define PARAM_TYPE_RANGE_AND_STATUS            22
+#define PARAM_TYPE_FACILITY_IND                24
+#define PARAM_TYPE_CLSD_USR_GRP_ILOCK_CD       26
+#define PARAM_TYPE_USER_SERVICE_INFO           29
+#define PARAM_TYPE_SIGNALLING_POINT_CODE       30
+#define PARAM_TYPE_USER_TO_USER_INFO           32
+#define PARAM_TYPE_CONNECTED_NR                33
+#define PARAM_TYPE_SUSP_RESUME_IND             34
+#define PARAM_TYPE_TRANSIT_NETW_SELECT         35
+#define PARAM_TYPE_EVENT_INFO                  36
+#define PARAM_TYPE_CIRC_ASSIGN_MAP             37
+#define PARAM_TYPE_CIRC_STATE_IND              38
+#define PARAM_TYPE_AUTO_CONG_LEVEL             39
+#define PARAM_TYPE_ORIG_CALLED_NR              40
+#define PARAM_TYPE_OPT_BACKW_CALL_IND          41
+#define PARAM_TYPE_USER_TO_USER_IND            42
+#define PARAM_TYPE_ORIG_ISC_POINT_CODE         43
+#define PARAM_TYPE_GENERIC_NOTIF_IND           44
+#define PARAM_TYPE_CALL_HIST_INFO              45
+#define PARAM_TYPE_ACC_DELIV_INFO              46
+#define PARAM_TYPE_NETW_SPECIFIC_FACLTY        47
+#define PARAM_TYPE_USER_SERVICE_INFO_PR        48
+#define PARAM_TYPE_PROPAG_DELAY_COUNTER        49
+#define PARAM_TYPE_REMOTE_OPERATIONS           50
+#define PARAM_TYPE_SERVICE_ACTIVATION          51
+#define PARAM_TYPE_USER_TELESERV_INFO          52
+#define PARAM_TYPE_TRANSM_MEDIUM_USED          53
+#define PARAM_TYPE_CALL_DIV_INFO               54
+#define PARAM_TYPE_ECHO_CTRL_INFO              55
+#define PARAM_TYPE_MSG_COMPAT_INFO             56
+#define PARAM_TYPE_PARAM_COMPAT_INFO           57
+#define PARAM_TYPE_MLPP_PRECEDENCE             58
+#define PARAM_TYPE_MCID_REQ_IND                59
+#define PARAM_TYPE_MCID_RSP_IND                60
+#define PARAM_TYPE_HOP_COUNTER                 61
+#define PARAM_TYPE_TRANSM_MEDIUM_RQUR_PR       62
+#define PARAM_TYPE_LOCATION_NR                 63
+#define PARAM_TYPE_REDIR_NR_RSTRCT             64
+#define PARAM_TYPE_CALL_TRANS_REF              67
+#define PARAM_TYPE_LOOP_PREV_IND               68
+#define PARAM_TYPE_CALL_TRANS_NR               69
+#define PARAM_TYPE_CCSS                        75
+#define PARAM_TYPE_FORW_GVNS                   76
+#define PARAM_TYPE_BACKW_GVNS                  77
+#define PARAM_TYPE_REDIRECT_CAPAB              78
+#define PARAM_TYPE_NETW_MGMT_CTRL              91
+#define PARAM_TYPE_CORRELATION_ID             101
+#define PARAM_TYPE_SCF_ID                     102
+#define PARAM_TYPE_CALL_DIV_TREAT_IND         110
+#define PARAM_TYPE_CALLED_IN_NR               111
+#define PARAM_TYPE_CALL_OFF_TREAT_IND         112
+#define PARAM_TYPE_CHARGED_PARTY_IDENT        113
+#define PARAM_TYPE_CONF_TREAT_IND             114
+#define PARAM_TYPE_DISPLAY_INFO               115
+#define PARAM_TYPE_UID_ACTION_IND             116
+#define PARAM_TYPE_UID_CAPAB_IND              117
+#define PARAM_TYPE_REDIRECT_COUNTER           119
+#define PARAM_TYPE_APPLICATON_TRANS           120
+#define PARAM_TYPE_COLLECT_CALL_REQ           121
+#define PARAM_TYPE_CALLING_GEODETIC_LOCATION  129     /* ANSI is the same */
+#define PARAM_TYPE_GENERIC_NR                 192
+#define PARAM_TYPE_GENERIC_DIGITS             193
+#define PARAM_TYPE_JURISDICTION               196
+#define PARAM_TYPE_GENERIC_NAME               199
+#define PARAM_TYPE_ORIG_LINE_INFO             234
+#define PARAM_TYPE_CHARGE_NR                  235
+
+#define ANSI_ISUP_PARAM_TYPE_OPER_SERV_INF   0xC2  /* 194 */
+#define ANSI_ISUP_PARAM_TYPE_EGRESS          0xC3  /* 195 */
+#define ANSI_ISUP_PARAM_TYPE_JURISDICTION    0xC4  /* 196 */
+#define ANSI_ISUP_PARAM_TYPE_CARRIER_ID      0xC5  /* 197 */
+#define ANSI_ISUP_PARAM_TYPE_BUSINESS_GRP    0xC6  /* 198 */
+#define ANSI_ISUP_PARAM_TYPE_GENERIC_NAME    0xC7  /* 199*/
+#define ANSI_ISUP_PARAM_TYPE_NOTIF_IND       0xE1  /* 225 */
+
+#define ANSI_ISUP_PARAM_TYPE_CG_CHAR_IND      229
+#define ANSI_ISUP_PARAM_TYPE_CVR_RESP_IND     230
+#define ANSI_ISUP_PARAM_TYPE_OUT_TRK_GRP_NM   231
+#define ANSI_ISUP_PARAM_TYPE_CI_NAME_IND      232
+#define ANSI_ISUP_PARAM_CLLI_CODE             233
+
+#define ANSI_ISUP_PARAM_ORIG_LINE_INF        0xEA  /* 234 */
+#define ANSI_ISUP_PARAM_CHRG_NO              0xEB  /* 235 */
+#define ANSI_ISUP_PARAM_SERV_CODE_IND        0xEC  /* 236 */
+#define ANSI_ISUP_PARAM_SPEC_PROC_REQ        0xED  /* 237 */
+#define ANSI_ISUP_PARAM_CARRIER_SEL_INF      0xEE  /* 238 */
+#define ANSI_ISUP_PARAM_NET_TRANS            0xEF  /* 239 */
+
+extern const value_string isup_parameter_type_value[];
+
+extern value_string_ext isup_transmission_medium_requirement_value_ext;
+extern value_string_ext bearer_network_connection_characteristics_vals_ext;
+extern value_string_ext x213_afi_value_ext;
+
+WS_VAR_IMPORT value_string_ext isup_calling_partys_category_value_ext;
 /*
  * Export dissection of some parameters
  */