daniel has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/30588 )
Change subject: abis: Add a timeout while waiting for connect()
......................................................................
abis: Add a timeout while waiting for connect()
Change-Id: I2b985d9ee472d5a39bc3da1dce1137ebabe93e85
Related: SYS#6237
---
M src/common/abis.c
1 file changed, 12 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/88/30588/1
diff --git a/src/common/abis.c b/src/common/abis.c
index 10eeaff..df0c655 100644
--- a/src/common/abis.c
+++ b/src/common/abis.c
@@ -284,8 +284,16 @@
{
switch (fi->state) {
case ABIS_LINK_ST_WAIT_RECONNECT:
- osmo_fsm_inst_state_chg(fi, ABIS_LINK_ST_CONNECTING, 0, 0);
+ osmo_fsm_inst_state_chg(fi, ABIS_LINK_ST_CONNECTING,
OML_RETRY_TIMER, 0);
break;
+ case ABIS_LINK_ST_CONNECTING:
+ {
+ struct abis_link_fsm_priv *priv = fi->priv;
+ struct gsm_bts *bts = priv->bts;
+ reset_oml_link(bts);
+ osmo_fsm_inst_state_chg(fi, ABIS_LINK_ST_CONNECTING,
OML_RETRY_TIMER, 0);
+ break;
+ }
default:
OSMO_ASSERT(0);
}
@@ -307,7 +315,8 @@
.out_state_mask =
S(ABIS_LINK_ST_WAIT_RECONNECT) |
S(ABIS_LINK_ST_CONNECTED) |
- S(ABIS_LINK_ST_FAILED),
+ S(ABIS_LINK_ST_FAILED) |
+ S(ABIS_LINK_ST_CONNECTING),
.onenter = abis_link_connecting_onenter,
.action = abis_link_connecting,
},
@@ -532,7 +541,7 @@
abis_link_fsm_priv->model_name = model_name;
bts->abis_link_fi->priv = abis_link_fsm_priv;
- osmo_fsm_inst_state_chg(bts->abis_link_fi, ABIS_LINK_ST_CONNECTING, 0,
0);
+ osmo_fsm_inst_state_chg(bts->abis_link_fi, ABIS_LINK_ST_CONNECTING,
OML_RETRY_TIMER, 0);
return 0;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/30588
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I2b985d9ee472d5a39bc3da1dce1137ebabe93e85
Gerrit-Change-Number: 30588
Gerrit-PatchSet: 1
Gerrit-Owner: daniel <[email protected]>
Gerrit-MessageType: newchange
