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

export nm_*_name() functions to get operational and availability state to strings

This commit is contained in:
Harald Welte 2009-03-10 19:43:44 +00:00
parent 44d542eba5
commit 4d87f24e6f
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/openbsc/abis_nm.h
View File

@ -569,4 +569,6 @@ enum nm_evt {
int nm_state_event(enum nm_evt evt, u_int8_t obj_class, void *obj, int nm_state_event(enum nm_evt evt, u_int8_t obj_class, void *obj,
struct gsm_nm_state *old_state, struct gsm_nm_state *new_state); struct gsm_nm_state *old_state, struct gsm_nm_state *new_state);
const char *nm_opstate_name(u_int8_t os);
const char *nm_avail_name(u_int8_t avail);
#endif /* _NM_H */ #endif /* _NM_H */

10
src/abis_nm.c
View File

@ -358,7 +358,7 @@ static const char *obj_class_name(u_int8_t oc)
return oc_names[oc]; return oc_names[oc];
} }
static const char *opstate_name(u_int8_t os) const char *nm_opstate_name(u_int8_t os)
{ {
switch (os) { switch (os) {
case 1: case 1:
@ -373,7 +373,7 @@ static const char *opstate_name(u_int8_t os)
} }
/* Chapter 9.4.7 */ /* Chapter 9.4.7 */
const char *avail_names[] = { static const char *avail_names[] = {
"In test", "In test",
"Failed", "Failed",
"Power off", "Power off",
@ -384,7 +384,7 @@ const char *avail_names[] = {
"Not installed", "Not installed",
}; };
static const char *avail_name(u_int8_t avail) const char *nm_avail_name(u_int8_t avail)
{ {
if (avail == 0xff) if (avail == 0xff)
return "OK"; return "OK";
@ -515,14 +515,14 @@ static int abis_nm_rx_statechg_rep(struct msgb *mb)
abis_nm_tlv_parse(&tp, foh->data, oh->length-sizeof(*foh)); abis_nm_tlv_parse(&tp, foh->data, oh->length-sizeof(*foh));
if (TLVP_PRESENT(&tp, NM_ATT_OPER_STATE)) { if (TLVP_PRESENT(&tp, NM_ATT_OPER_STATE)) {
new_state.operational = *TLVP_VAL(&tp, NM_ATT_OPER_STATE); new_state.operational = *TLVP_VAL(&tp, NM_ATT_OPER_STATE);
DEBUGPC(DNM, "OP_STATE=%s ", opstate_name(new_state.operational)); DEBUGPC(DNM, "OP_STATE=%s ", nm_opstate_name(new_state.operational));
} }
if (TLVP_PRESENT(&tp, NM_ATT_AVAIL_STATUS)) { if (TLVP_PRESENT(&tp, NM_ATT_AVAIL_STATUS)) {
if (TLVP_LEN(&tp, NM_ATT_AVAIL_STATUS) == 0) if (TLVP_LEN(&tp, NM_ATT_AVAIL_STATUS) == 0)
new_state.availability = 0xff; new_state.availability = 0xff;
else else
new_state.availability = *TLVP_VAL(&tp, NM_ATT_AVAIL_STATUS); new_state.availability = *TLVP_VAL(&tp, NM_ATT_AVAIL_STATUS);
DEBUGPC(DNM, "AVAIL=%s(%02x) ", avail_name(new_state.availability), DEBUGPC(DNM, "AVAIL=%s(%02x) ", nm_avail_name(new_state.availability),
new_state.availability); new_state.availability);
} }
if (TLVP_PRESENT(&tp, NM_ATT_ADM_STATE)) { if (TLVP_PRESENT(&tp, NM_ATT_ADM_STATE)) {