aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2018-12-05 19:27:25 +0100
committerAnders Broman <a.broman58@gmail.com>2018-12-05 21:16:37 +0000
commit56b255dcbd9b92990a58ad490751bcdd7442a9f7 (patch)
tree1a3ec7b5ff4d183ed4cc13d67a6e8b6d89857bd3
parent4d5cbf5e2ac94cdac5c7d0961fbaa9b599a92487 (diff)
packet-rsl: Use defines for ip.access value_string
Change-Id: I447a30068e5a4b9a510abec75498691e17cbaa32 Reviewed-on: https://code.wireshark.org/review/30927 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r--epan/dissectors/packet-rsl.c76
1 files changed, 38 insertions, 38 deletions
diff --git a/epan/dissectors/packet-rsl.c b/epan/dissectors/packet-rsl.c
index 2ab7268c85..18e81edeec 100644
--- a/epan/dissectors/packet-rsl.c
+++ b/epan/dissectors/packet-rsl.c
@@ -473,26 +473,26 @@ static const value_string rsl_msg_type_vals[] = {
/* 0 1 - - - - - - Location Services messages: */
/* 0x41 */ { 0x41, "Location Information" }, /* 8.7.1 */
/* ip.access */
- { 0x48, "ip.access PDCH ACTIVATION" },
- { 0x49, "ip.access PDCH ACTIVATION ACK" },
- { 0x4a, "ip.access PDCH ACTIVATION NACK" },
- { 0x4b, "ip.access PDCH DEACTIVATION" },
- { 0x4c, "ip.access PDCH DEACTIVATION ACK" },
- { 0x4d, "ip.access PDCH DEACTIVATION NACK" },
- { 0x60, "ip.access MEASurement PREPROCessing DeFauLT" },
- { 0x61, "ip.access HANDOover CANDidate ENQuiry" },
- { 0x62, "ip.access HANDOover CANDidate RESPonse" },
- { 0x70, "ip.access CRCX" },
- { 0x71, "ip.access CRCX ACK" },
- { 0x72, "ip.access CRCX NACK" },
- { 0x73, "ip.access MDCX" },
- { 0x74, "ip.access MDCX ACK" },
- { 0x75, "ip.access MDCX NACK" },
- { 0x76, "ip.access DLCX INDication" },
- { 0x77, "ip.access DLCX" },
- { 0x78, "ip.access DLCX ACK" },
- { 0x79, "ip.access DLCX NACK" },
- { 0, NULL }
+/* 0x48 */ { RSL_MSG_TYPE_IPAC_PDCH_ACT, "ip.access PDCH ACTIVATION" },
+/* 0x49 */ { RSL_MSG_TYPE_IPAC_PDCH_ACT_ACK, "ip.access PDCH ACTIVATION ACK" },
+/* 0x4a */ { RSL_MSG_TYPE_IPAC_PDCH_ACT_NACK, "ip.access PDCH ACTIVATION NACK" },
+/* 0x4b */ { RSL_MSG_TYPE_IPAC_PDCH_DEACT, "ip.access PDCH DEACTIVATION" },
+/* 0x4c */ { RSL_MSG_TYPE_IPAC_PDCH_DEACT_ACK, "ip.access PDCH DEACTIVATION ACK" },
+/* 0x4d */ { RSL_MSG_TYPE_IPAC_PDCH_DEACT_NACK,"ip.access PDCH DEACTIVATION NACK" },
+/* 0x60 */ { RSL_MSG_TYPE_IPAC_MEAS_PP_DEF, "ip.access MEASurement PREPROCessing DeFauLT" },
+/* 0x61 */ { RSL_MSG_TYPE_IPAC_HO_CAND_INQ, "ip.access HANDOover CANDidate ENQuiry" },
+/* 0x62 */ { RSL_MSG_TYPE_IPAC_HO_CAND_RESP, "ip.access HANDOover CANDidate RESPonse" },
+/* 0x70 */ { RSL_MSG_TYPE_IPAC_CRCX, "ip.access CRCX" },
+/* 0x71 */ { RSL_MSG_TYPE_IPAC_CRCX_ACK, "ip.access CRCX ACK" },
+/* 0x72 */ { RSL_MSG_TYPE_IPAC_CRCX_NACK, "ip.access CRCX NACK" },
+/* 0x73 */ { RSL_MSG_TYPE_IPAC_MDCX, "ip.access MDCX" },
+/* 0x74 */ { RSL_MSG_TYPE_IPAC_MDCX_ACK, "ip.access MDCX ACK" },
+/* 0x75 */ { RSL_MSG_TYPE_IPAC_MDCX_NACK, "ip.access MDCX NACK" },
+/* 0x76 */ { RSL_MSG_TYPE_IPAC_DLCX_IND, "ip.access DLCX INDication" },
+/* 0x77 */ { RSL_MSG_TYPE_IPAC_DLCX, "ip.access DLCX" },
+/* 0x78 */ { RSL_MSG_TYPE_IPAC_DLCX_ACK, "ip.access DLCX ACK" },
+/* 0x79 */ { RSL_MSG_TYPE_IPAC_DLCX_NACK, "ip.access DLCX NACK" },
+/* 0x48 */ { 0, NULL }
};
static value_string_ext rsl_msg_type_vals_ext = VALUE_STRING_EXT_INIT(rsl_msg_type_vals);
@@ -642,24 +642,24 @@ static const value_string rsl_ie_type_vals[] = {
Not used
*/
-/* 0xe0 */ { 0xe0, "SRTP Configuration" },
-/* 0xe1 */ { 0xe1, "BSC Proxy UDP Port" },
-/* 0xe2 */ { 0xe2, "BSC Multiplex Timeout" },
-/* 0xf0 */ { 0xf0, "Remote IP Address" },
-/* 0xf1 */ { 0xf1, "Remote RTP Port" },
-/* 0xf2 */ { 0xf2, "RTP Payload Type" },
-/* 0xf3 */ { 0xf3, "Local RTP Port" },
-/* 0xf4 */ { 0xf4, "Speech Mode" },
-/* 0xf5 */ { 0xf5, "Local IP Address" },
-/* 0xf6 */ { 0xf6, "Connection Statistics" },
-/* 0xf7 */ { 0xf7, "Handover C Parameters" },
-/* 0xf8 */ { 0xf8, "Connection Identifier" },
-/* 0xf9 */ { 0xf9, "RTP CSD Format" },
-/* 0xfa */ { 0xfa, "RTP Jitter Buffer" },
-/* 0xfb */ { 0xfb, "RTP Compression" },
-/* 0xfc */ { 0xfc, "RTP Payload Type 2" },
-/* 0xfd */ { 0xfd, "RTP Multiplex" },
-/* 0xfe */ { 0xfe, "RTP Multiplex Identifier" },
+/* 0xe0 */ { RSL_IE_IPAC_SRTP_CONFIG,"SRTP Configuration" },
+/* 0xe1 */ { RSL_IE_IPAC_PROXY_UDP, "BSC Proxy UDP Port" },
+/* 0xe2 */ { RSL_IE_IPAC_BSCMPL_TOUT,"BSC Multiplex Timeout" },
+/* 0xf0 */ { RSL_IE_IPAC_REMOTE_IP, "Remote IP Address" },
+/* 0xf1 */ { RSL_IE_IPAC_REMOTE_PORT,"Remote RTP Port" },
+/* 0xf2 */ { RSL_IE_IPAC_RTP_PAYLOAD,"RTP Payload Type" },
+/* 0xf3 */ { RSL_IE_IPAC_LOCAL_PORT, "Local RTP Port" },
+/* 0xf4 */ { RSL_IE_IPAC_SPEECH_MODE,"Speech Mode" },
+/* 0xf5 */ { RSL_IE_IPAC_LOCAL_IP, "Local IP Address" },
+/* 0xf6 */ { RSL_IE_IPAC_CONN_STAT, "Connection Statistics" },
+/* 0xf7 */ { RSL_IE_IPAC_HO_C_PARMS, "Handover C Parameters" },
+/* 0xf8 */ { RSL_IE_IPAC_CONN_ID, "Connection Identifier" },
+/* 0xf9 */ { RSL_IE_IPAC_RTP_CSD_FMT,"RTP CSD Format" },
+/* 0xfa */ { RSL_IE_IPAC_RTP_JIT_BUF,"RTP Jitter Buffer" },
+/* 0xfb */ { RSL_IE_IPAC_RTP_COMPR, "RTP Compression" },
+/* 0xfc */ { RSL_IE_IPAC_RTP_PAYLOAD2,"RTP Payload Type 2" },
+/* 0xfd */ { RSL_IE_IPAC_RTP_MPLEX, "RTP Multiplex" },
+/* 0xfe */ { RSL_IE_IPAC_RTP_MPLEX_ID,"RTP Multiplex Identifier" },
{ 0, NULL }
};
static value_string_ext rsl_ie_type_vals_ext = VALUE_STRING_EXT_INIT(rsl_ie_type_vals);