laforge submitted this change.

View Change

Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved
iuup: do not use illegal characters in state/event names.

The event names contain '.', and there are spaces ' ' in the state
names. This is a problem since states and events can also be monitored
via the CTRL interface. Unfortunately the CTRL interface does not allow
certain reserved characters. So lets rename the states and event names
to make them compatible with the CTRL interface.

Change-Id: Id19973b56f9d7b1e3d0b0d7c7d0be7beba5428fc
Related OS#4149

Change-Id: I5ebc9ab5b1456fee29aa4e254fae862dc053f0aa
---
M src/gsm/iuup.c
1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/gsm/iuup.c b/src/gsm/iuup.c
index dbca344..eb595ce 100644
--- a/src/gsm/iuup.c
+++ b/src/gsm/iuup.c
@@ -160,15 +160,15 @@
};

static const struct value_string iuup_fsm_event_names[] = {
- { IUUP_FSM_EVT_IUUP_CONFIG_REQ, "IuUP-CONFIG.req" },
- { IUUP_FSM_EVT_IUUP_DATA_REQ, "IuUP-DATA.req" },
- { IUUP_FSM_EVT_IUUP_DATA_IND, "IuUP-DATA.ind" },
- { IUUP_FSM_EVT_IUUP_STATUS_REQ, "IuUP-STATUS.req" },
- { IUUP_FSM_EVT_IUUP_STATUS_IND, "IuUP-STATUS.ind" },
- { IUUP_FSM_EVT_SSASAR_UNITDATA_REQ, "SSSAR-UNITDATA.req" },
- { IUUP_FSM_EVT_SSASAR_UNITDATA_IND, "SSSAR-UNITDATA.ind" },
- { IUUP_FSM_EVT_IUUP_UNITDATA_REQ, "IuUP-UNITDATA.req" },
- { IUUP_FSM_EVT_IUUP_UNITDATA_IND, "IuUP-UNITDATA.ind" },
+ { IUUP_FSM_EVT_IUUP_CONFIG_REQ, "IuUP-CONFIG-req" },
+ { IUUP_FSM_EVT_IUUP_DATA_REQ, "IuUP-DATA-req" },
+ { IUUP_FSM_EVT_IUUP_DATA_IND, "IuUP-DATA-ind" },
+ { IUUP_FSM_EVT_IUUP_STATUS_REQ, "IuUP-STATUS-req" },
+ { IUUP_FSM_EVT_IUUP_STATUS_IND, "IuUP-STATUS-ind" },
+ { IUUP_FSM_EVT_SSASAR_UNITDATA_REQ, "SSSAR-UNITDATA-req" },
+ { IUUP_FSM_EVT_SSASAR_UNITDATA_IND, "SSSAR-UNITDATA-ind" },
+ { IUUP_FSM_EVT_IUUP_UNITDATA_REQ, "IuUP-UNITDATA-req" },
+ { IUUP_FSM_EVT_IUUP_UNITDATA_IND, "IuUP-UNITDATA-ind" },
{ IUUP_FSM_EVT_INIT, "INIT" },
{ IUUP_FSM_EVT_LAST_INIT_ACK, "LAST_INIT_ACK" },
{ IUUP_FSM_EVT_INIT_NACK, "INIT_NACK" },
@@ -789,7 +789,7 @@
S(IUUP_FSM_EVT_SSASAR_UNITDATA_REQ) |
S(IUUP_FSM_EVT_SSASAR_UNITDATA_IND),
.out_state_mask = S(IUUP_FSM_ST_NULL),
- .name = "TrM Data Transfer Ready",
+ .name = "TrM_Data_Transfer_Ready",
.action = iuup_fsm_trm_data,
},
[IUUP_FSM_ST_INIT] = {
@@ -808,7 +808,7 @@
S(IUUP_FSM_EVT_IUUP_DATA_IND),
.out_state_mask = S(IUUP_FSM_ST_NULL) |
S(IUUP_FSM_ST_INIT),
- .name = "SMpSDU Data Transfer Ready",
+ .name = "SMpSDU_Data_Transfer_Ready",
.action = iuup_fsm_smpsdu_data,
},
};

To view, visit change 26947. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I5ebc9ab5b1456fee29aa4e254fae862dc053f0aa
Gerrit-Change-Number: 26947
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-Reviewer: osmith <osmith@sysmocom.de>
Gerrit-Reviewer: pespin <pespin@sysmocom.de>
Gerrit-MessageType: merged