neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/28813 )

Change subject: mgw_fsm: move MGCP timeout to mgw_fsm_T_defs ......................................................................

mgw_fsm: move MGCP timeout to mgw_fsm_T_defs

For the tdefs used by libosmo-mgcp-client, passed via osmo_mgcpc_ep_alloc(), do not use the separate mgw_tdefs. Instead, move X2427 to mgw_fsm_T_defs. This makes X2427 VTY configurable.

Related: SYS#5895 Change-Id: I2aa67121c20dc3da5fd937a02b6747468622f317 --- M src/osmo-hnbgw/mgw_fsm.c M src/osmo-hnbgw/tdefs.c 2 files changed, 3 insertions(+), 7 deletions(-)

Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved

diff --git a/src/osmo-hnbgw/mgw_fsm.c b/src/osmo-hnbgw/mgw_fsm.c index 1dc9884..a343e80 100644 --- a/src/osmo-hnbgw/mgw_fsm.c +++ b/src/osmo-hnbgw/mgw_fsm.c @@ -122,12 +122,7 @@ uint16_t msc_rtp_port; };

-static const struct osmo_tdef mgw_tdefs[] = { - {.T = -2427, .default_val = 5, .desc = "timeout for MGCP response from MGW" }, - { } -}; - -static const struct osmo_tdef_state_timeout mgw_fsm_timeouts[32] = { +struct osmo_tdef_state_timeout mgw_fsm_timeouts[32] = { [MGW_ST_CRCX_HNB] = {.T = -1001 }, [MGW_ST_ASSIGN] = {.T = -1002 }, [MGW_ST_MDCX_HNB] = {.T = -1003 }, @@ -179,7 +174,7 @@

epname = mgcp_client_rtpbridge_wildcard(map->hnb_ctx->gw->mgcp_client); mgw_fsm_priv->mgcpc_ep = - osmo_mgcpc_ep_alloc(fi, MGW_EV_MGCP_TERM, map->hnb_ctx->gw->mgcp_client, mgw_tdefs, fi->id, "%s", epname); + osmo_mgcpc_ep_alloc(fi, MGW_EV_MGCP_TERM, map->hnb_ctx->gw->mgcp_client, mgw_fsm_T_defs, fi->id, "%s", epname); mgw_fsm_priv->mgcpc_ep_ci_hnb = osmo_mgcpc_ep_ci_add(mgw_fsm_priv->mgcpc_ep, "to-HNB");

osmo_mgcpc_ep_ci_request(mgw_fsm_priv->mgcpc_ep_ci_hnb, MGCP_VERB_CRCX, &mgw_info, fi, MGW_EV_MGCP_OK, diff --git a/src/osmo-hnbgw/tdefs.c b/src/osmo-hnbgw/tdefs.c index d8198f2..13e04c5 100644 --- a/src/osmo-hnbgw/tdefs.c +++ b/src/osmo-hnbgw/tdefs.c @@ -21,6 +21,7 @@ {.T = -1002, .default_val = 10, .desc = "Timeout for the HNB to respond to RAB Assignment Request" }, {.T = -1003, .default_val = 5, .desc = "Timeout for HNB side call-leg (to-HNB) completion" }, {.T = -1004, .default_val = 5, .desc = "Timeout for MSC side call-leg (to-MSC) completion" }, + {.T = -2427, .default_val = 5, .desc = "timeout for MGCP response from MGW" }, { } };