This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
Harald Welte gerrit-no-reply at lists.osmocom.orgHarald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9504 ) Change subject: make T10 configurable like the rest of them ...................................................................... make T10 configurable like the rest of them Change-Id: I112c0db17d355d57eb08bc67121ccf49fbf53943 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_subscr_conn_fsm.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/net_init.c 4 files changed, 9 insertions(+), 6 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 8f245c9..5794617 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -1185,6 +1185,7 @@ #define GSM_T3119_DEFAULT 10 #define GSM_T3122_DEFAULT 10 #define GSM_T3141_DEFAULT 10 +#define GSM_T10_DEFAULT 6 /* RR Assignment timeout, in seconds */ #define GSM_T7_DEFAULT 10 /* inter-BSC MO Handover first timeout, in seconds */ #define GSM_T8_DEFAULT 10 /* inter-BSC MO Handover second timeout, in seconds */ #define GSM_T101_DEFAULT 10 /* inter-BSC MT Handover timeout, in seconds */ @@ -1233,6 +1234,7 @@ int T3119; int T3122; int T3141; + int T10; /*< RR Assignment timeout, in seconds */ int T7; /*< inter-BSC handover MO timeout from Handover Required to Handover Command */ int T8; /*< inter-BSC handover MO timeout from Handover Command to final Clear*/ int T101; /*< inter-BSC handover MT timeout from Handover Request to Handover Accept */ diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index d2d2095..9c8dbda 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -45,9 +45,6 @@ #define MGCP_MGW_HO_TIMEOUT 4 /* in seconds */ #define MGCP_MGW_HO_TIMEOUT_TIMER_NR 2 -#define GSM0808_T10_TIMER_NR 10 -#define GSM0808_T10_VALUE 6 - #define ENDPOINT_ID "rtpbridge/*@mgw" enum gscon_fsm_states { @@ -447,7 +444,7 @@ return; } - osmo_fsm_inst_state_chg(fi, ST_WAIT_ASS_CMPL, GSM0808_T10_VALUE, GSM0808_T10_TIMER_NR); + osmo_fsm_inst_state_chg(fi, ST_WAIT_ASS_CMPL, conn->network->T10, 10); break; default: /* An unsupported channel is requested, so we have to @@ -534,7 +531,7 @@ return; } - osmo_fsm_inst_state_chg(fi, ST_WAIT_ASS_CMPL, GSM0808_T10_VALUE, GSM0808_T10_TIMER_NR); + osmo_fsm_inst_state_chg(fi, ST_WAIT_ASS_CMPL, conn->network->T10, 10); break; case GSCON_EV_MO_DTAP: forward_dtap(conn, (struct msgb *)data, fi); @@ -1050,7 +1047,7 @@ * gscon_cleanup() above) */ osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REGULAR, NULL); break; - case GSM0808_T10_TIMER_NR: /* Assignment Failed */ + case 10: /* Assignment Failed */ assignment_failed(fi, GSM0808_CAUSE_RADIO_INTERFACE_FAILURE); break; case MGCP_MGW_TIMEOUT_TIMER_NR: /* Assignment failed (no response from MGW) */ diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 837f431..57c5363 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -1001,6 +1001,7 @@ VTY_OUT_TIMER(3119); VTY_OUT_TIMER(3122); VTY_OUT_TIMER(3141); + VTY_OUT_TIMER(10); VTY_OUT_TIMER(7); VTY_OUT_TIMER(8); VTY_OUT_TIMER(101); @@ -1921,6 +1922,7 @@ DECLARE_TIMER(3119, "Currently not used") DECLARE_TIMER(3122, "Default waiting time (seconds) after IMM ASS REJECT") DECLARE_TIMER(3141, "Currently not used") +DECLARE_TIMER(10, "Assignment Command timeout in seconds") DECLARE_TIMER(7, "Set the outgoing inter-BSC Handover timeout, from Handover Required to Handover Command") DECLARE_TIMER(8, "Set the outgoing inter-BSC Handover timeout, from Handover Command to final Clear") DECLARE_TIMER(101, "Set the incoming inter-BSC Handover timeout, from Handover Request to Accept") @@ -4849,6 +4851,7 @@ install_element(GSMNET_NODE, &cfg_net_T3119_cmd); install_element(GSMNET_NODE, &cfg_net_T3122_cmd); install_element(GSMNET_NODE, &cfg_net_T3141_cmd); + install_element(GSMNET_NODE, &cfg_net_T10_cmd); install_element(GSMNET_NODE, &cfg_net_T7_cmd); install_element(GSMNET_NODE, &cfg_net_T8_cmd); install_element(GSMNET_NODE, &cfg_net_T101_cmd); diff --git a/src/osmo-bsc/net_init.c b/src/osmo-bsc/net_init.c index 5a48988..3ee35fe 100644 --- a/src/osmo-bsc/net_init.c +++ b/src/osmo-bsc/net_init.c @@ -64,6 +64,7 @@ net->T3119 = GSM_T3119_DEFAULT; net->T3122 = GSM_T3122_DEFAULT; net->T3141 = GSM_T3141_DEFAULT; + net->T10 = GSM_T10_DEFAULT; net->T7 = GSM_T7_DEFAULT; net->T8 = GSM_T8_DEFAULT; net->T101 = GSM_T101_DEFAULT; -- To view, visit https://gerrit.osmocom.org/9504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I112c0db17d355d57eb08bc67121ccf49fbf53943 Gerrit-Change-Number: 9504 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de> Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org> Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180608/aba2da24/attachment.htm>