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

l2tpd_packet/fsm: fix last missing parts for conf_fsm

This commit is contained in:
Alexander Couzens 2016-10-30 21:08:47 +01:00 committed by Harald Welte
parent 68ee0c9ef6
commit 0cd2a3d8bd
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
siu/l2tp/l2tpd_fsm.c
View File

@ -112,6 +112,7 @@ static void l2tp_conf_s_init(struct osmo_fsm_inst *fi, uint32_t event, void *dat
switch (event) {
case L2CONF_E_TX_TCRQ:
l2tp_tx_tc_rq(l2c);
osmo_fsm_inst_state_chg(fi, L2CONF_S_WAIT_FOR_TCRP, 0, 0);
break;
}
}
@ -122,8 +123,8 @@ static void l2tp_conf_s_wait_for_tcrp(struct osmo_fsm_inst *fi, uint32_t event,
switch (event) {
case L2CONF_E_RX_TCRP:
l2tp_tx_altc_rq_timeslot(l2c);
osmo_fsm_inst_state_chg(fi, L2CONF_S_WAIT_FOR_ALTCRP, 0, 0);
l2tp_tx_ack(l2c);
osmo_fsm_inst_state_chg(fi, L2CONF_S_WAIT_FOR_TC_SESSIONS, 0, 0);
break;
}
}
@ -201,7 +202,7 @@ static const struct value_string l2tp_conf_events[] = {
{ L2CONF_E_TX_TCRQ, "TX-TCRQ" },
{ L2CONF_E_RX_TCRP, "RX-TCRP" },
{ L2CONF_E_RX_ALTCRP, "RX-ALTCRP" },
{ L2IC_E_RX_ICCN, "RX-InCall-Connect" },
{ L2CONF_E_ESTABLISH_SESSION, "RX-InCall-Connect" },
{ 0, NULL }
};
@ -221,7 +222,7 @@ static const struct osmo_fsm_state l2tp_conf_states[] = {
.action = l2tp_conf_s_wait_for_tcrp,
},
[L2CONF_S_WAIT_FOR_TC_SESSIONS] = {
.in_event_mask = S(L2CONF_E_RX_TCRP),
.in_event_mask = S(L2CONF_E_ESTABLISH_SESSION),
.out_state_mask = S(L2CONF_S_WAIT_FOR_ALTCRP) |
S(L2CONF_S_INIT),
.name = "WAIT_FOR_TC_SESSIONS",
@ -235,7 +236,7 @@ static const struct osmo_fsm_state l2tp_conf_states[] = {
.action = l2tp_conf_s_wait_for_altcrp,
},
[L2CONF_S_WAIT_FOR_ALTC_SESSIONS] = {
.in_event_mask = S(L2CONF_E_RX_TCRP),
.in_event_mask = S(L2CONF_E_ESTABLISH_SESSION),
.out_state_mask = S(L2CONF_S_ESTABLISHED) |
S(L2CONF_S_INIT),
.name = "WAIT_FOR_ALTC_SESSIONS",

4
siu/l2tp/l2tpd_fsm.h
View File

@ -17,10 +17,6 @@ enum l2tpd_ctrl_con_event {
L2CC_E_RX_SCCCN,
/* Received Stop CCN */
L2CC_E_RX_STOP_CCN,
/* Received Transport configuration Reply */
L2CC_E_RX_TCRP,
/* Received Abis Lower Transport configuration Reply */
L2CC_E_RX_ALTCRP,
/* Received a HELLO / Keepalive */
L2CC_E_RX_HELLO,
};

4
siu/l2tp/l2tpd_packet.c
View File

@ -725,7 +725,7 @@ static int rx_eri_tcrp(struct l2tpd_connection *l2c, struct msgb *msg, struct av
/* FIXME: result message */
osmo_fsm_inst_dispatch(l2c->fsm, L2CC_E_LOCAL_CLOSE_REQ, msg);
}
osmo_fsm_inst_dispatch(l2c->fsm, L2CC_E_RX_TCRP, msg);
osmo_fsm_inst_dispatch(l2c->conf_fsm, L2CONF_E_RX_TCRP, msg);
return 0;
}
@ -747,7 +747,7 @@ static int rx_eri_altcrp(struct l2tpd_connection *l2c, struct msgb *msg, struct
/* FIXME: result message */
osmo_fsm_inst_dispatch(l2c->fsm, L2CC_E_LOCAL_CLOSE_REQ, msg);
}
osmo_fsm_inst_dispatch(l2c->fsm, L2CC_E_RX_ALTCRP, msg);
osmo_fsm_inst_dispatch(l2c->conf_fsm, L2CONF_E_RX_ALTCRP, msg);
return 0;
}