<p>lynxis lazus has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/22903">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_ns2_sns: rename fsm events to include RX or REQ prefix<br><br>An event which originates by a received PDU is prefixed by RX.<br>An event which originates by code gets a REQ prefix.<br><br>Change-Id: Ia8a6378cdca19b086e89058b1cc055f45c0bba7b<br>---<br>M src/gb/gprs_ns2_sns.c<br>1 file changed, 62 insertions(+), 62 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/03/22903/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gb/gprs_ns2_sns.c b/src/gb/gprs_ns2_sns.c</span><br><span>index 27e6d1f..e2070ae 100644</span><br><span>--- a/src/gb/gprs_ns2_sns.c</span><br><span>+++ b/src/gb/gprs_ns2_sns.c</span><br><span>@@ -70,31 +70,31 @@</span><br><span> };</span><br><span> </span><br><span> enum gprs_sns_event {</span><br><span style="color: hsl(0, 100%, 40%);">- GPRS_SNS_EV_SELECT_ENDPOINT, /*!< Select a SNS endpoint from the list */</span><br><span style="color: hsl(0, 100%, 40%);">- GPRS_SNS_EV_SIZE,</span><br><span style="color: hsl(0, 100%, 40%);">- GPRS_SNS_EV_SIZE_ACK,</span><br><span style="color: hsl(0, 100%, 40%);">- GPRS_SNS_EV_CONFIG,</span><br><span style="color: hsl(0, 100%, 40%);">- GPRS_SNS_EV_CONFIG_END, /*!< SNS-CONFIG with end flag received */</span><br><span style="color: hsl(0, 100%, 40%);">- GPRS_SNS_EV_CONFIG_ACK,</span><br><span style="color: hsl(0, 100%, 40%);">- GPRS_SNS_EV_ADD,</span><br><span style="color: hsl(0, 100%, 40%);">- GPRS_SNS_EV_DELETE,</span><br><span style="color: hsl(0, 100%, 40%);">- GPRS_SNS_EV_CHANGE_WEIGHT,</span><br><span style="color: hsl(0, 100%, 40%);">- GPRS_SNS_EV_NO_NSVC,</span><br><span style="color: hsl(0, 100%, 40%);">- GPRS_SNS_EV_NSVC_ALIVE, /*!< a NS-VC became alive */</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_SNS_EV_REQ_SELECT_ENDPOINT, /*!< Select a SNS endpoint from the list */</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_SNS_EV_RX_SIZE,</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_SNS_EV_RX_SIZE_ACK,</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_SNS_EV_RX_CONFIG,</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_SNS_EV_RX_CONFIG_END, /*!< SNS-CONFIG with end flag received */</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_SNS_EV_RX_CONFIG_ACK,</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_SNS_EV_RX_ADD,</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_SNS_EV_RX_DELETE,</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_SNS_EV_RX_CHANGE_WEIGHT,</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_SNS_EV_REQ_NO_NSVC,</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_SNS_EV_REQ_NSVC_ALIVE, /*!< a NS-VC became alive */</span><br><span> };</span><br><span> </span><br><span> static const struct value_string gprs_sns_event_names[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- { GPRS_SNS_EV_SELECT_ENDPOINT, "SELECT_ENDPOINT" },</span><br><span style="color: hsl(0, 100%, 40%);">- { GPRS_SNS_EV_SIZE, "SIZE" },</span><br><span style="color: hsl(0, 100%, 40%);">- { GPRS_SNS_EV_SIZE_ACK, "SIZE_ACK" },</span><br><span style="color: hsl(0, 100%, 40%);">- { GPRS_SNS_EV_CONFIG, "CONFIG" },</span><br><span style="color: hsl(0, 100%, 40%);">- { GPRS_SNS_EV_CONFIG_END, "CONFIG_END" },</span><br><span style="color: hsl(0, 100%, 40%);">- { GPRS_SNS_EV_CONFIG_ACK, "CONFIG_ACK" },</span><br><span style="color: hsl(0, 100%, 40%);">- { GPRS_SNS_EV_ADD, "ADD" },</span><br><span style="color: hsl(0, 100%, 40%);">- { GPRS_SNS_EV_DELETE, "DELETE" },</span><br><span style="color: hsl(0, 100%, 40%);">- { GPRS_SNS_EV_CHANGE_WEIGHT, "CHANGE_WEIGHT" },</span><br><span style="color: hsl(0, 100%, 40%);">- { GPRS_SNS_EV_NO_NSVC, "NO_NSVC" },</span><br><span style="color: hsl(0, 100%, 40%);">- { GPRS_SNS_EV_NSVC_ALIVE, "NSVC_ALIVE"},</span><br><span style="color: hsl(120, 100%, 40%);">+ { GPRS_SNS_EV_REQ_SELECT_ENDPOINT, "SELECT_ENDPOINT" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GPRS_SNS_EV_RX_SIZE, "SIZE" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GPRS_SNS_EV_RX_SIZE_ACK, "SIZE_ACK" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GPRS_SNS_EV_RX_CONFIG, "CONFIG" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GPRS_SNS_EV_RX_CONFIG_END, "CONFIG_END" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GPRS_SNS_EV_RX_CONFIG_ACK, "CONFIG_ACK" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GPRS_SNS_EV_RX_ADD, "ADD" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GPRS_SNS_EV_RX_DELETE, "DELETE" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GPRS_SNS_EV_RX_CHANGE_WEIGHT, "CHANGE_WEIGHT" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GPRS_SNS_EV_REQ_NO_NSVC, "NO_NSVC" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GPRS_SNS_EV_REQ_NSVC_ALIVE, "NSVC_ALIVE"},</span><br><span> { 0, NULL }</span><br><span> };</span><br><span> </span><br><span>@@ -272,7 +272,7 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_NO_NSVC, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_REQ_NO_NSVC, NULL);</span><br><span> }</span><br><span> </span><br><span> static void ns2_clear_ipv46_entries(struct ns2_sns_state *gss)</span><br><span>@@ -702,7 +702,7 @@</span><br><span> struct tlv_parsed *tp = NULL;</span><br><span> </span><br><span> switch (event) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_SNS_EV_SIZE_ACK:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_SNS_EV_RX_SIZE_ACK:</span><br><span> tp = data;</span><br><span> if (TLVP_VAL_MINLEN(tp, NS_IE_CAUSE, 1)) {</span><br><span> LOGPFSML(fi, LOGL_ERROR, "SNS-SIZE-ACK with cause %s\n",</span><br><span>@@ -862,7 +862,7 @@</span><br><span> struct gprs_ns2_nse *nse = nse_inst_from_fi(fi);</span><br><span> </span><br><span> switch (event) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_SNS_EV_CONFIG_ACK:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_SNS_EV_RX_CONFIG_ACK:</span><br><span> tp = (struct tlv_parsed *) data;</span><br><span> if (TLVP_VAL_MINLEN(tp, NS_IE_CAUSE, 1)) {</span><br><span> LOGPFSML(fi, LOGL_ERROR, "SNS-CONFIG-ACK with cause %s\n",</span><br><span>@@ -942,7 +942,7 @@</span><br><span> </span><br><span> LOGPFSML(fi, LOGL_INFO, "Rx SNS-CONFIG: Remote IPv4 list now %u entries\n",</span><br><span> gss->num_ip4_remote);</span><br><span style="color: hsl(0, 100%, 40%);">- if (event == GPRS_SNS_EV_CONFIG_END) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (event == GPRS_SNS_EV_RX_CONFIG_END) {</span><br><span> /* check if sum of data / sig weights == 0 */</span><br><span> if (ip4_weight_sum_data(gss->ip4_remote, gss->num_ip4_remote) == 0 ||</span><br><span> ip4_weight_sum_sig(gss->ip4_remote, gss->num_ip4_remote) == 0) {</span><br><span>@@ -993,7 +993,7 @@</span><br><span> </span><br><span> LOGPFSML(fi, LOGL_INFO, "Rx SNS-CONFIG: Remote IPv6 list now %u entries\n",</span><br><span> gss->num_ip6_remote);</span><br><span style="color: hsl(0, 100%, 40%);">- if (event == GPRS_SNS_EV_CONFIG_END) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (event == GPRS_SNS_EV_RX_CONFIG_END) {</span><br><span> /* check if sum of data / sig weights == 0 */</span><br><span> if (ip6_weight_sum_data(gss->ip6_remote, gss->num_ip6_remote) == 0 ||</span><br><span> ip6_weight_sum_sig(gss->ip6_remote, gss->num_ip6_remote) == 0) {</span><br><span>@@ -1027,8 +1027,8 @@</span><br><span> struct ns2_sns_state *gss = (struct ns2_sns_state *) fi->priv;</span><br><span> </span><br><span> switch (event) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_SNS_EV_CONFIG_END:</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_SNS_EV_CONFIG:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_SNS_EV_RX_CONFIG_END:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_SNS_EV_RX_CONFIG:</span><br><span> </span><br><span> #if 0 /* part of incoming SNS-SIZE (doesn't happen on BSS side */</span><br><span> if (TLVP_PRESENT(tp, NS_IE_RESET_FLAG)) {</span><br><span>@@ -1298,16 +1298,16 @@</span><br><span> struct tlv_parsed *tp = data;</span><br><span> </span><br><span> switch (event) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_SNS_EV_ADD:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_SNS_EV_RX_ADD:</span><br><span> ns2_sns_st_configured_add(fi, gss, tp);</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_SNS_EV_DELETE:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_SNS_EV_RX_DELETE:</span><br><span> ns2_sns_st_configured_delete(fi, gss, tp);</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_SNS_EV_CHANGE_WEIGHT:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_SNS_EV_RX_CHANGE_WEIGHT:</span><br><span> ns2_sns_st_configured_change(fi, gss, tp);</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_SNS_EV_NSVC_ALIVE:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_SNS_EV_REQ_NSVC_ALIVE:</span><br><span> osmo_timer_del(&fi->timer);</span><br><span> break;</span><br><span> }</span><br><span>@@ -1327,7 +1327,7 @@</span><br><span> .action = ns2_sns_st_unconfigured,</span><br><span> },</span><br><span> [GPRS_SNS_ST_SIZE] = {</span><br><span style="color: hsl(0, 100%, 40%);">- .in_event_mask = S(GPRS_SNS_EV_SIZE_ACK),</span><br><span style="color: hsl(120, 100%, 40%);">+ .in_event_mask = S(GPRS_SNS_EV_RX_SIZE_ACK),</span><br><span> .out_state_mask = S(GPRS_SNS_ST_UNCONFIGURED) |</span><br><span> S(GPRS_SNS_ST_SIZE) |</span><br><span> S(GPRS_SNS_ST_CONFIG_BSS),</span><br><span>@@ -1336,7 +1336,7 @@</span><br><span> .onenter = ns2_sns_st_size_onenter,</span><br><span> },</span><br><span> [GPRS_SNS_ST_CONFIG_BSS] = {</span><br><span style="color: hsl(0, 100%, 40%);">- .in_event_mask = S(GPRS_SNS_EV_CONFIG_ACK),</span><br><span style="color: hsl(120, 100%, 40%);">+ .in_event_mask = S(GPRS_SNS_EV_RX_CONFIG_ACK),</span><br><span> .out_state_mask = S(GPRS_SNS_ST_UNCONFIGURED) |</span><br><span> S(GPRS_SNS_ST_CONFIG_BSS) |</span><br><span> S(GPRS_SNS_ST_CONFIG_SGSN) |</span><br><span>@@ -1346,8 +1346,8 @@</span><br><span> .onenter = ns2_sns_st_config_bss_onenter,</span><br><span> },</span><br><span> [GPRS_SNS_ST_CONFIG_SGSN] = {</span><br><span style="color: hsl(0, 100%, 40%);">- .in_event_mask = S(GPRS_SNS_EV_CONFIG) |</span><br><span style="color: hsl(0, 100%, 40%);">- S(GPRS_SNS_EV_CONFIG_END),</span><br><span style="color: hsl(120, 100%, 40%);">+ .in_event_mask = S(GPRS_SNS_EV_RX_CONFIG) |</span><br><span style="color: hsl(120, 100%, 40%);">+ S(GPRS_SNS_EV_RX_CONFIG_END),</span><br><span> .out_state_mask = S(GPRS_SNS_ST_UNCONFIGURED) |</span><br><span> S(GPRS_SNS_ST_CONFIG_SGSN) |</span><br><span> S(GPRS_SNS_ST_CONFIGURED) |</span><br><span>@@ -1357,10 +1357,10 @@</span><br><span> .onenter = ns2_sns_st_config_sgsn_onenter,</span><br><span> },</span><br><span> [GPRS_SNS_ST_CONFIGURED] = {</span><br><span style="color: hsl(0, 100%, 40%);">- .in_event_mask = S(GPRS_SNS_EV_ADD) |</span><br><span style="color: hsl(0, 100%, 40%);">- S(GPRS_SNS_EV_DELETE) |</span><br><span style="color: hsl(0, 100%, 40%);">- S(GPRS_SNS_EV_CHANGE_WEIGHT) |</span><br><span style="color: hsl(0, 100%, 40%);">- S(GPRS_SNS_EV_NSVC_ALIVE),</span><br><span style="color: hsl(120, 100%, 40%);">+ .in_event_mask = S(GPRS_SNS_EV_RX_ADD) |</span><br><span style="color: hsl(120, 100%, 40%);">+ S(GPRS_SNS_EV_RX_DELETE) |</span><br><span style="color: hsl(120, 100%, 40%);">+ S(GPRS_SNS_EV_RX_CHANGE_WEIGHT) |</span><br><span style="color: hsl(120, 100%, 40%);">+ S(GPRS_SNS_EV_REQ_NSVC_ALIVE),</span><br><span> .out_state_mask = S(GPRS_SNS_ST_UNCONFIGURED) |</span><br><span> S(GPRS_SNS_ST_SIZE),</span><br><span> .name = "CONFIGURED",</span><br><span>@@ -1380,7 +1380,7 @@</span><br><span> case 1:</span><br><span> if (gss->N >= nsi->timeout[NS_TOUT_TSNS_SIZE_RETRIES]) {</span><br><span> LOGPFSML(fi, LOGL_ERROR, "NSE %d: Size retries failed. Selecting next IP-SNS endpoint.\n", nse->nsei);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_SELECT_ENDPOINT, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_REQ_SELECT_ENDPOINT, NULL);</span><br><span> } else {</span><br><span> osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_SIZE, nsi->timeout[NS_TOUT_TSNS_PROV], 1);</span><br><span> }</span><br><span>@@ -1388,7 +1388,7 @@</span><br><span> case 2:</span><br><span> if (gss->N >= nsi->timeout[NS_TOUT_TSNS_CONFIG_RETRIES]) {</span><br><span> LOGPFSML(fi, LOGL_ERROR, "NSE %d: BSS Config retries failed. Selecting next IP-SNS endpoint.\n", nse->nsei);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_SELECT_ENDPOINT, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_REQ_SELECT_ENDPOINT, NULL);</span><br><span> } else {</span><br><span> osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_CONFIG_BSS, nsi->timeout[NS_TOUT_TSNS_PROV], 2);</span><br><span> }</span><br><span>@@ -1396,14 +1396,14 @@</span><br><span> case 3:</span><br><span> if (gss->N >= nsi->timeout[NS_TOUT_TSNS_CONFIG_RETRIES]) {</span><br><span> LOGPFSML(fi, LOGL_ERROR, "NSE %d: SGSN Config retries failed. Selecting next IP-SNS endpoint.\n", nse->nsei);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_SELECT_ENDPOINT, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_REQ_SELECT_ENDPOINT, NULL);</span><br><span> } else {</span><br><span> osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_CONFIG_SGSN, nsi->timeout[NS_TOUT_TSNS_PROV], 3);</span><br><span> }</span><br><span> break;</span><br><span> case 4:</span><br><span> LOGPFSML(fi, LOGL_ERROR, "NSE %d: Config succeeded but no NS-VC came online. Selecting next IP-SNS endpoint.\n", nse->nsei);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_SELECT_ENDPOINT, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_REQ_SELECT_ENDPOINT, NULL);</span><br><span> break;</span><br><span> }</span><br><span> return 0;</span><br><span>@@ -1416,15 +1416,15 @@</span><br><span> </span><br><span> /* reset when receiving GPRS_SNS_EV_NO_NSVC */</span><br><span> switch (event) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_SNS_EV_NO_NSVC:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_SNS_EV_REQ_NO_NSVC:</span><br><span> /* ignore reselection running */</span><br><span> if (gss->reselection_running)</span><br><span> break;</span><br><span> </span><br><span> LOGPFSML(fi, LOGL_ERROR, "NSE %d: no remaining NSVC, resetting SNS FSM\n", nse->nsei);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_SELECT_ENDPOINT, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_REQ_SELECT_ENDPOINT, NULL);</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_SNS_EV_SELECT_ENDPOINT:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_SNS_EV_REQ_SELECT_ENDPOINT:</span><br><span> /* tear down previous state</span><br><span> * gprs_ns2_free_nsvcs() will trigger NO_NSVC, prevent this from triggering a reselection */</span><br><span> gss->reselection_running = true;</span><br><span>@@ -1457,8 +1457,8 @@</span><br><span> .name = "GPRS-NS2-SNS-BSS",</span><br><span> .states = ns2_sns_bss_states,</span><br><span> .num_states = ARRAY_SIZE(ns2_sns_bss_states),</span><br><span style="color: hsl(0, 100%, 40%);">- .allstate_event_mask = S(GPRS_SNS_EV_NO_NSVC) |</span><br><span style="color: hsl(0, 100%, 40%);">- S(GPRS_SNS_EV_SELECT_ENDPOINT),</span><br><span style="color: hsl(120, 100%, 40%);">+ .allstate_event_mask = S(GPRS_SNS_EV_REQ_NO_NSVC) |</span><br><span style="color: hsl(120, 100%, 40%);">+ S(GPRS_SNS_EV_REQ_SELECT_ENDPOINT),</span><br><span> .allstate_action = ns2_sns_st_all_action,</span><br><span> .cleanup = NULL,</span><br><span> .timer_cb = ns2_sns_fsm_bss_timer_cb,</span><br><span>@@ -1523,28 +1523,28 @@</span><br><span> </span><br><span> switch (nsh->pdu_type) {</span><br><span> case SNS_PDUT_SIZE:</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_SIZE, tp);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_RX_SIZE, tp);</span><br><span> break;</span><br><span> case SNS_PDUT_SIZE_ACK:</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_SIZE_ACK, tp);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_RX_SIZE_ACK, tp);</span><br><span> break;</span><br><span> case SNS_PDUT_CONFIG:</span><br><span> if (nsh->data[0] & 0x01)</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_CONFIG_END, tp);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_RX_CONFIG_END, tp);</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_CONFIG, tp);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_RX_CONFIG, tp);</span><br><span> break;</span><br><span> case SNS_PDUT_CONFIG_ACK:</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_CONFIG_ACK, tp);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_RX_CONFIG_ACK, tp);</span><br><span> break;</span><br><span> case SNS_PDUT_ADD:</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_ADD, tp);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_RX_ADD, tp);</span><br><span> break;</span><br><span> case SNS_PDUT_DELETE:</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_DELETE, tp);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_RX_DELETE, tp);</span><br><span> break;</span><br><span> case SNS_PDUT_CHANGE_WEIGHT:</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_CHANGE_WEIGHT, tp);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_RX_CHANGE_WEIGHT, tp);</span><br><span> break;</span><br><span> case SNS_PDUT_ACK:</span><br><span> LOGPFSML(fi, LOGL_NOTICE, "NSEI=%u Rx unsupported SNS PDU type %s\n", nsei,</span><br><span>@@ -1688,7 +1688,7 @@</span><br><span> </span><br><span> llist_add_tail(&endpoint->list, &gss->sns_endpoints);</span><br><span> if (do_selection)</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(nse->bss_sns_fi, GPRS_SNS_EV_SELECT_ENDPOINT, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(nse->bss_sns_fi, GPRS_SNS_EV_REQ_SELECT_ENDPOINT, NULL);</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>@@ -1798,7 +1798,7 @@</span><br><span> </span><br><span> if (alive) {</span><br><span> gss->alive = true;</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(nse->bss_sns_fi, GPRS_SNS_EV_NSVC_ALIVE, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(nse->bss_sns_fi, GPRS_SNS_EV_REQ_NSVC_ALIVE, NULL);</span><br><span> } else {</span><br><span> /* is there at least another alive nsvc? */</span><br><span> llist_for_each_entry(tmp, &nse->nsvc, list) {</span><br><span>@@ -1808,7 +1808,7 @@</span><br><span> </span><br><span> /* all NS-VC have failed */</span><br><span> gss->alive = false;</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(nse->bss_sns_fi, GPRS_SNS_EV_NO_NSVC, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(nse->bss_sns_fi, GPRS_SNS_EV_REQ_NO_NSVC, NULL);</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>@@ -1842,7 +1842,7 @@</span><br><span> llist_add_tail(&tmp->list, &gss->binds);</span><br><span> </span><br><span> if (trigger_reselection) {</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(nse->bss_sns_fi, GPRS_SNS_EV_SELECT_ENDPOINT, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(nse->bss_sns_fi, GPRS_SNS_EV_REQ_SELECT_ENDPOINT, NULL);</span><br><span> } else {</span><br><span> /* TODO: do a add SNS-IP procedure & add nsvc() */</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/22903">change 22903</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/libosmocore/+/22903"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ia8a6378cdca19b086e89058b1cc055f45c0bba7b </div>
<div style="display:none"> Gerrit-Change-Number: 22903 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>