cellular-infrastructure
/
osmo-bsc
mirror of https://gerrit.osmocom.org/osmo-bsc
9
0
Fork 0
Code Issues Releases Wiki Activity

replace gsm48_cc_msg_names[] with gsm48_cc_msg_name() 

and implement the backend using value_string
This commit is contained in:
Harald Welte 2010-03-25 12:00:54 +08:00
parent e9e190a8d8
commit 9eb6d88d64
2 changed files with 54 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/osmocore/gsm48.h
View File

@ -5,8 +5,8 @@
#include <osmocore/gsm48_ie.h> #include <osmocore/gsm48_ie.h>
extern const struct tlv_definition gsm48_att_tlvdef; extern const struct tlv_definition gsm48_att_tlvdef;
extern const char *cc_state_names[32]; const char *gsm48_cc_state_name(uint8_t state);
extern const char *gsm48_cc_msg_names[0x40]; const char *gsm48_cc_msg_name(uint8_t msgtype);
const char *rr_cause_name(uint8_t cause); const char *rr_cause_name(uint8_t cause);
void gsm48_generate_lai(struct gsm48_loc_area_id *lai48, uint16_t mcc, void gsm48_generate_lai(struct gsm48_loc_area_id *lai48, uint16_t mcc,

120
src/gsm48.c
View File

@ -1,7 +1,7 @@
/* GSM Mobile Radio Interface Layer 3 messages /* GSM Mobile Radio Interface Layer 3 messages
* 3GPP TS 04.08 version 7.21.0 Release 1998 / ETSI TS 100 940 V7.21.0 */ * 3GPP TS 04.08 version 7.21.0 Release 1998 / ETSI TS 100 940 V7.21.0 */
/* (C) 2008-2009 by Harald Welte <laforge@gnumonks.org> /* (C) 2008-2010 by Harald Welte <laforge@gnumonks.org>
* (C) 2008, 2009 by Holger Hans Peter Freyther <zecke@selfish.org> * (C) 2008, 2009 by Holger Hans Peter Freyther <zecke@selfish.org>
* *
* All Rights Reserved * All Rights Reserved
@ -96,7 +96,8 @@ static const struct value_string rr_cause_names[] = {
{ 0, NULL }, { 0, NULL },
}; };
const char *cc_state_names[32] = { /* FIXME: convert to value_string */
static const char *cc_state_names[32] = {
"NULL", "NULL",
"INITIATED", "INITIATED",
"illegal state 2", "illegal state 2",
@ -131,74 +132,57 @@ const char *cc_state_names[32] = {
"illegal state 31", "illegal state 31",
}; };
const char *gsm48_cc_msg_names[0x40] = { const char *gsm48_cc_state_name(uint8_t state)
"unknown 0x00", {
"ALERTING", if (state < ARRAY_SIZE(cc_state_names))
"CALL_PROC", return cc_state_names[state];
"PROGRESS",
"ESTAB", return "invalid";
"SETUP", }
"ESTAB_CONF",
"CONNECT", static const struct value_string cc_msg_names[] = {
"CALL_CONF", { GSM48_MT_CC_ALERTING, "ALERTING" },
"START_CC", { GSM48_MT_CC_CALL_PROC, "CALL_PROC" },
"unknown 0x0a", { GSM48_MT_CC_PROGRESS, "PROGRESS" },
"RECALL", { GSM48_MT_CC_ESTAB, "ESTAB" },
"unknown 0x0c", { GSM48_MT_CC_SETUP, "SETUP" },
"unknown 0x0d", { GSM48_MT_CC_ESTAB_CONF, "ESTAB_CONF" },
"EMERG_SETUP", { GSM48_MT_CC_CONNECT, "CONNECT" },
"CONNECT_ACK", { GSM48_MT_CC_CALL_CONF, "CALL_CONF" },
"USER_INFO", { GSM48_MT_CC_START_CC, "START_CC" },
"unknown 0x11", { GSM48_MT_CC_RECALL, "RECALL" },
"unknown 0x12", { GSM48_MT_CC_EMERG_SETUP, "EMERG_SETUP" },
"MODIFY_REJECT", { GSM48_MT_CC_CONNECT_ACK, "CONNECT_ACK" },
"unknown 0x14", { GSM48_MT_CC_USER_INFO, "USER_INFO" },
"unknown 0x15", { GSM48_MT_CC_MODIFY_REJECT, "MODIFY_REJECT" },
"unknown 0x16", { GSM48_MT_CC_MODIFY, "MODIFY" },
"MODIFY", { GSM48_MT_CC_HOLD, "HOLD" },
"HOLD", { GSM48_MT_CC_HOLD_ACK, "HOLD_ACK" },
"HOLD_ACK", { GSM48_MT_CC_HOLD_REJ, "HOLD_REJ" },
"HOLD_REJ", { GSM48_MT_CC_RETR, "RETR" },
"unknown 0x1b", { GSM48_MT_CC_RETR_ACK, "RETR_ACK" },
"RETR", { GSM48_MT_CC_RETR_REJ, "RETR_REJ" },
"RETR_ACK", { GSM48_MT_CC_MODIFY_COMPL, "MODIFY_COMPL" },
"RETR_REJ", { GSM48_MT_CC_DISCONNECT, "DISCONNECT" },
"MODIFY_COMPL", { GSM48_MT_CC_RELEASE_COMPL, "RELEASE_COMPL" },
"unknown 0x20", { GSM48_MT_CC_RELEASE, "RELEASE" },
"unknown 0x21", { GSM48_MT_CC_STOP_DTMF, "STOP_DTMF" },
"unknown 0x22", { GSM48_MT_CC_STOP_DTMF_ACK, "STOP_DTMF_ACK" },
"unknown 0x23", { GSM48_MT_CC_STATUS_ENQ, "STATUS_ENQ" },
"unknown 0x24", { GSM48_MT_CC_START_DTMF, "START_DTMF" },
"DISCONNECT", { GSM48_MT_CC_START_DTMF_ACK, "START_DTMF_ACK" },
"unknown 0x26", { GSM48_MT_CC_START_DTMF_REJ, "START_DTMF_REJ" },
"unknown 0x27", { GSM48_MT_CC_CONG_CTRL, "CONG_CTRL" },
"unknown 0x28", { GSM48_MT_CC_FACILITY, "FACILITY" },
"unknown 0x29", { GSM48_MT_CC_STATUS, "STATUS" },
"RELEASE_COMPL", { GSM48_MT_CC_NOTIFY, "NOTFIY" },
"unknown 0x2b", { 0, NULL }
"unknown 0x2c",
"RELEASE",
"unknown 0x2e",
"unknown 0x2f",
"unknown 0x30",
"STOP_DTMF",
"STOP_DTMF_ACK",
"unknown 0x33",
"STATUS_ENQ",
"START_DTMF",
"START_DTMF_ACK",
"START_DTMF_REJ",
"unknown 0x38",
"CONG_CTRL",
"FACILITY",
"unknown 0x3b",
"STATUS",
"unknown 0x3d",
"NOTIFY",
"unknown 0x3f",
}; };
static char strbuf[64]; const char *gsm48_cc_msg_name(uint8_t msgtype)
{
return get_value_string(cc_msg_names, msgtype);
}
const char *rr_cause_name(uint8_t cause) const char *rr_cause_name(uint8_t cause)
{ {