<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13796">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">move mgw endpoint FSM to osmo-mgw.git<br><br>osmo-mgw.git also includes fixes of the MGW endpoint FSM, for example<br>I92a9944acc96398acd6649f9c3c5badec5dd6dcc.<br><br>Depends: I9a3effd38e72841529df6c135c077116981dea36 (osmo-mgw)<br>Change-Id: I03e6b48d9b0a5370310d5f56809259ff7909cf9d<br>---<br>M include/osmocom/bsc/Makefile.am<br>M include/osmocom/bsc/bsc_subscr_conn_fsm.h<br>M include/osmocom/bsc/gsm_data.h<br>M include/osmocom/bsc/lchan_rtp_fsm.h<br>D include/osmocom/bsc/mgw_endpoint_fsm.h<br>M src/osmo-bsc/Makefile.am<br>M src/osmo-bsc/assignment_fsm.c<br>M src/osmo-bsc/bsc_subscr_conn_fsm.c<br>M src/osmo-bsc/bsc_vty.c<br>M src/osmo-bsc/codec_pref.c<br>M src/osmo-bsc/handover_fsm.c<br>M src/osmo-bsc/lchan_fsm.c<br>M src/osmo-bsc/lchan_rtp_fsm.c<br>D src/osmo-bsc/mgw_endpoint_fsm.c<br>M src/osmo-bsc/net_init.c<br>M src/osmo-bsc/osmo_bsc_bssap.c<br>M src/osmo-bsc/osmo_bsc_lcls.c<br>M src/osmo-bsc/osmo_bsc_main.c<br>M tests/handover/Makefile.am<br>M tests/handover/handover_test.c<br>20 files changed, 187 insertions(+), 939 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/Makefile.am b/include/osmocom/bsc/Makefile.am</span><br><span>index 21e53d7..89323c0 100644</span><br><span>--- a/include/osmocom/bsc/Makefile.am</span><br><span>+++ b/include/osmocom/bsc/Makefile.am</span><br><span>@@ -33,7 +33,6 @@</span><br><span> meas_feed.h \</span><br><span> meas_rep.h \</span><br><span> misdn.h \</span><br><span style="color: hsl(0, 100%, 40%);">- mgw_endpoint_fsm.h \</span><br><span> neighbor_ident.h \</span><br><span> network_listen.h \</span><br><span> openbscdefines.h \</span><br><span>diff --git a/include/osmocom/bsc/bsc_subscr_conn_fsm.h b/include/osmocom/bsc/bsc_subscr_conn_fsm.h</span><br><span>index f5ed7bd..5475272 100644</span><br><span>--- a/include/osmocom/bsc/bsc_subscr_conn_fsm.h</span><br><span>+++ b/include/osmocom/bsc/bsc_subscr_conn_fsm.h</span><br><span>@@ -43,7 +43,7 @@</span><br><span> struct gsm_subscriber_connection;</span><br><span> struct gsm_network;</span><br><span> struct msgb;</span><br><span style="color: hsl(0, 100%, 40%);">-struct mgwep_ci;</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_mgcpc_ep_ci;</span><br><span> struct assignment_request;</span><br><span> struct gsm_lchan;</span><br><span> </span><br><span>@@ -57,15 +57,15 @@</span><br><span> struct msgb *msg, int link_id, int allow_sacch);</span><br><span> int gscon_sigtran_send(struct gsm_subscriber_connection *conn, struct msgb *msg);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct mgw_endpoint *gscon_ensure_mgw_endpoint(struct gsm_subscriber_connection *conn,</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t msc_assigned_cic);</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_mgcpc_ep *gscon_ensure_mgw_endpoint(struct gsm_subscriber_connection *conn,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t msc_assigned_cic);</span><br><span> bool gscon_connect_mgw_to_msc(struct gsm_subscriber_connection *conn,</span><br><span> struct gsm_lchan *for_lchan,</span><br><span> const char *addr, uint16_t port,</span><br><span> struct osmo_fsm_inst *notify,</span><br><span> uint32_t event_success, uint32_t event_failure,</span><br><span> void *notify_data,</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgwep_ci **created_ci);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_mgcpc_ep_ci **created_ci);</span><br><span> </span><br><span> void gscon_start_assignment(struct gsm_subscriber_connection *conn,</span><br><span> struct assignment_request *req);</span><br><span>@@ -76,7 +76,7 @@</span><br><span> void gscon_lchan_releasing(struct gsm_subscriber_connection *conn, struct gsm_lchan *lchan);</span><br><span> void gscon_forget_lchan(struct gsm_subscriber_connection *conn, struct gsm_lchan *lchan);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void gscon_forget_mgw_endpoint_ci(struct gsm_subscriber_connection *conn, struct mgwep_ci *ci);</span><br><span style="color: hsl(120, 100%, 40%);">+void gscon_forget_mgw_endpoint_ci(struct gsm_subscriber_connection *conn, struct osmo_mgcpc_ep_ci *ci);</span><br><span> </span><br><span> bool gscon_is_aoip(struct gsm_subscriber_connection *conn);</span><br><span> bool gscon_is_sccplite(struct gsm_subscriber_connection *conn);</span><br><span>diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h</span><br><span>index 7b813a6..dacc63b 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -39,7 +39,7 @@</span><br><span> struct mgcp_client_conf;</span><br><span> struct mgcp_client;</span><br><span> struct gsm0808_cell_id;</span><br><span style="color: hsl(0, 100%, 40%);">-struct mgw_endpoint;</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_mgcpc_ep;</span><br><span> </span><br><span> /** annotations for msgb ownership */</span><br><span> #define __uses</span><br><span>@@ -136,7 +136,7 @@</span><br><span> /* Whether this assignment triggered creation of the MGW endpoint: if the assignment</span><br><span> * fails, we will release that again as soon as possible. (If false, the endpoint already</span><br><span> * existed before or isn't needed at all.)*/</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgwep_ci *created_ci_for_msc;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_mgcpc_ep_ci *created_ci_for_msc;</span><br><span> </span><br><span> enum gsm0808_cause failure_cause;</span><br><span> enum gsm48_rr_cause rr_cause;</span><br><span>@@ -205,7 +205,7 @@</span><br><span> struct gsm_lchan *new_lchan;</span><br><span> bool async;</span><br><span> struct handover_in_req inter_bsc_in;</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgwep_ci *created_ci_for_msc;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_mgcpc_ep_ci *created_ci_for_msc;</span><br><span> };</span><br><span> </span><br><span> /* active radio connection of a mobile subscriber */</span><br><span>@@ -287,11 +287,11 @@</span><br><span> </span><br><span> /* The endpoint at the MGW used to join both BTS and MSC side connections, e.g.</span><br><span> * "rtpbridge/23@mgw". */</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgw_endpoint *mgw_endpoint;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_mgcpc_ep *mgw_endpoint;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* The connection identifier of the mgw_endpoint used to transceive RTP towards the MSC.</span><br><span style="color: hsl(120, 100%, 40%);">+ /* The connection identifier of the osmo_mgcpc_ep used to transceive RTP towards the MSC.</span><br><span> * (The BTS side CI is handled by struct gsm_lchan and the lchan_fsm.) */</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgwep_ci *mgw_endpoint_ci_msc;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_mgcpc_ep_ci *mgw_endpoint_ci_msc;</span><br><span> } user_plane;</span><br><span> </span><br><span> /* LCLS (local call, local switch) related state */</span><br><span>@@ -554,7 +554,7 @@</span><br><span> </span><br><span> struct osmo_fsm_inst *fi;</span><br><span> struct osmo_fsm_inst *fi_rtp;</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgwep_ci *mgw_endpoint_ci_bts;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_mgcpc_ep_ci *mgw_endpoint_ci_bts;</span><br><span> </span><br><span> struct {</span><br><span> struct lchan_activate_info info;</span><br><span>@@ -1535,6 +1535,7 @@</span><br><span> struct {</span><br><span> struct mgcp_client_conf *conf;</span><br><span> struct mgcp_client *client;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_tdef *tdefs;</span><br><span> } mgw;</span><br><span> </span><br><span> /* Remote BSS Cell Identifier Lists */</span><br><span>diff --git a/include/osmocom/bsc/lchan_rtp_fsm.h b/include/osmocom/bsc/lchan_rtp_fsm.h</span><br><span>index fa0e746..6ff8fe3 100644</span><br><span>--- a/include/osmocom/bsc/lchan_rtp_fsm.h</span><br><span>+++ b/include/osmocom/bsc/lchan_rtp_fsm.h</span><br><span>@@ -10,6 +10,7 @@</span><br><span> } while(0)</span><br><span> </span><br><span> struct gsm_lchan;</span><br><span style="color: hsl(120, 100%, 40%);">+struct mgcp_conn_peer;</span><br><span> </span><br><span> enum lchan_rtp_fsm_state {</span><br><span> LCHAN_RTP_ST_WAIT_MGW_ENDPOINT_AVAILABLE,</span><br><span>@@ -40,6 +41,8 @@</span><br><span> };</span><br><span> </span><br><span> void lchan_rtp_fsm_start(struct gsm_lchan *lchan);</span><br><span style="color: hsl(0, 100%, 40%);">-struct mgwep_ci *lchan_use_mgw_endpoint_ci_bts(struct gsm_lchan *lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_mgcpc_ep_ci *lchan_use_mgw_endpoint_ci_bts(struct gsm_lchan *lchan);</span><br><span> bool lchan_rtp_established(struct gsm_lchan *lchan);</span><br><span> void lchan_forget_mgw_endpoint(struct gsm_lchan *lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void mgcp_pick_codec(struct mgcp_conn_peer *verb_info, const struct gsm_lchan *lchan, bool bss_side);</span><br><span>diff --git a/include/osmocom/bsc/mgw_endpoint_fsm.h b/include/osmocom/bsc/mgw_endpoint_fsm.h</span><br><span>deleted file mode 100644</span><br><span>index f86a7cd..0000000</span><br><span>--- a/include/osmocom/bsc/mgw_endpoint_fsm.h</span><br><span>+++ /dev/null</span><br><span>@@ -1,59 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-/* osmo-bsc API to manage all sides of an MGW endpoint */</span><br><span style="color: hsl(0, 100%, 40%);">-#pragma once</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/mgcp_client/mgcp_client_fsm.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/bsc/debug.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* This macro automatically includes a final \n, if omitted. */</span><br><span style="color: hsl(0, 100%, 40%);">-#define LOG_MGWEP(mgwep, level, fmt, args...) do { \</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPFSML(mgwep->fi, level, "(%s) " fmt, \</span><br><span style="color: hsl(0, 100%, 40%);">- mgw_endpoint_name(mgwep), ## args); \</span><br><span style="color: hsl(0, 100%, 40%);">- } while(0)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-enum mgwep_fsm_state {</span><br><span style="color: hsl(0, 100%, 40%);">- MGWEP_ST_UNUSED,</span><br><span style="color: hsl(0, 100%, 40%);">- MGWEP_ST_WAIT_MGW_RESPONSE,</span><br><span style="color: hsl(0, 100%, 40%);">- MGWEP_ST_IN_USE,</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-enum mgwep_fsm_event {</span><br><span style="color: hsl(0, 100%, 40%);">- _MGWEP_EV_LAST,</span><br><span style="color: hsl(0, 100%, 40%);">- /* and MGW response events are allocated dynamically */</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-struct mgw_endpoint;</span><br><span style="color: hsl(0, 100%, 40%);">-struct mgwep_ci;</span><br><span style="color: hsl(0, 100%, 40%);">-struct osmo_tdef;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void mgw_endpoint_fsm_init(struct osmo_tdef *T_defs);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-struct mgw_endpoint *mgw_endpoint_alloc(struct osmo_fsm_inst *parent, uint32_t parent_term_event,</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgcp_client *mgcp_client,</span><br><span style="color: hsl(0, 100%, 40%);">- const char *fsm_id,</span><br><span style="color: hsl(0, 100%, 40%);">- const char *endpoint_str_fmt, ...);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-struct mgwep_ci *mgw_endpoint_ci_add(struct mgw_endpoint *mgwep,</span><br><span style="color: hsl(0, 100%, 40%);">- const char *label_fmt, ...);</span><br><span style="color: hsl(0, 100%, 40%);">-const struct mgcp_conn_peer *mgwep_ci_get_rtp_info(const struct mgwep_ci *ci);</span><br><span style="color: hsl(0, 100%, 40%);">-bool mgwep_ci_get_crcx_info_to_sockaddr(const struct mgwep_ci *ci, struct sockaddr_storage *dest);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void mgw_endpoint_ci_request(struct mgwep_ci *ci,</span><br><span style="color: hsl(0, 100%, 40%);">- enum mgcp_verb verb, const struct mgcp_conn_peer *verb_info,</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_fsm_inst *notify,</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t event_success, uint32_t event_failure,</span><br><span style="color: hsl(0, 100%, 40%);">- void *notify_data);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static inline void mgw_endpoint_ci_dlcx(struct mgwep_ci *ci)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- mgw_endpoint_ci_request(ci, MGCP_VERB_DLCX, NULL, NULL, 0, 0, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void mgw_endpoint_clear(struct mgw_endpoint *mgwep);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-const char *mgw_endpoint_name(const struct mgw_endpoint *mgwep);</span><br><span style="color: hsl(0, 100%, 40%);">-const char *mgwep_ci_name(const struct mgwep_ci *ci);</span><br><span style="color: hsl(0, 100%, 40%);">-const char *mgcp_conn_peer_name(const struct mgcp_conn_peer *info);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-enum mgcp_codecs chan_mode_to_mgcp_codec(enum gsm48_chan_mode chan_mode, bool full_rate);</span><br><span style="color: hsl(0, 100%, 40%);">-void mgcp_pick_codec(struct mgcp_conn_peer *verb_info, const struct gsm_lchan *lchan, bool bss_side);</span><br><span>diff --git a/src/osmo-bsc/Makefile.am b/src/osmo-bsc/Makefile.am</span><br><span>index 11803da..e88e614 100644</span><br><span>--- a/src/osmo-bsc/Makefile.am</span><br><span>+++ b/src/osmo-bsc/Makefile.am</span><br><span>@@ -68,7 +68,6 @@</span><br><span> lchan_select.c \</span><br><span> meas_feed.c \</span><br><span> meas_rep.c \</span><br><span style="color: hsl(0, 100%, 40%);">- mgw_endpoint_fsm.c \</span><br><span> neighbor_ident.c \</span><br><span> neighbor_ident_vty.c \</span><br><span> net_init.c \</span><br><span>diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c</span><br><span>index 520498f..fdfc080 100644</span><br><span>--- a/src/osmo-bsc/assignment_fsm.c</span><br><span>+++ b/src/osmo-bsc/assignment_fsm.c</span><br><span>@@ -23,12 +23,11 @@</span><br><span> #include <osmocom/core/tdef.h></span><br><span> #include <osmocom/gsm/gsm0808.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/mgcp_client/mgcp_client_fsm.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/mgcp_client/mgcp_client_endpoint_fsm.h></span><br><span> </span><br><span> #include <osmocom/bsc/debug.h></span><br><span> #include <osmocom/bsc/gsm_data.h></span><br><span> #include <osmocom/bsc/lchan_fsm.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/bsc/mgw_endpoint_fsm.h></span><br><span> #include <osmocom/bsc/bsc_subscr_conn_fsm.h></span><br><span> #include <osmocom/bsc/osmo_bsc_lcls.h></span><br><span> #include <osmocom/bsc/bsc_msc_data.h></span><br><span>@@ -105,7 +104,7 @@</span><br><span> gscon_forget_mgw_endpoint_ci(conn, conn->assignment.created_ci_for_msc);</span><br><span> /* If this is the last endpoint released, the mgw_endpoint_fsm will terminate and tell</span><br><span> * the gscon about it. */</span><br><span style="color: hsl(0, 100%, 40%);">- mgw_endpoint_ci_dlcx(conn->assignment.created_ci_for_msc);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mgcpc_ep_ci_dlcx(conn->assignment.created_ci_for_msc);</span><br><span> }</span><br><span> </span><br><span> conn->assignment = (struct assignment_fsm_data){</span><br><span>@@ -156,8 +155,8 @@</span><br><span> perm_spch = gsm0808_permitted_speech(lchan->type, lchan->tch_mode);</span><br><span> </span><br><span> if (gscon_is_aoip(conn)) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (!mgwep_ci_get_crcx_info_to_sockaddr(conn->user_plane.mgw_endpoint_ci_msc,</span><br><span style="color: hsl(0, 100%, 40%);">- &addr_local)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!osmo_mgcpc_ep_ci_get_crcx_info_to_sockaddr(conn->user_plane.mgw_endpoint_ci_msc,</span><br><span style="color: hsl(120, 100%, 40%);">+ &addr_local)) {</span><br><span> assignment_fail(GSM0808_CAUSE_EQUIPMENT_FAILURE,</span><br><span> "Unable to compose RTP address of MGW -> MSC");</span><br><span> return;</span><br><span>@@ -626,7 +625,7 @@</span><br><span> /* For AoIP, we created the MGW endpoint. Ensure it is really there, and log it. */</span><br><span> if (gscon_is_aoip(conn)) {</span><br><span> const struct mgcp_conn_peer *mgw_info;</span><br><span style="color: hsl(0, 100%, 40%);">- mgw_info = mgwep_ci_get_rtp_info(conn->user_plane.mgw_endpoint_ci_msc);</span><br><span style="color: hsl(120, 100%, 40%);">+ mgw_info = osmo_mgcpc_ep_ci_get_rtp_info(conn->user_plane.mgw_endpoint_ci_msc);</span><br><span> if (!mgw_info) {</span><br><span> assignment_fail(GSM0808_CAUSE_EQUIPMENT_FAILURE,</span><br><span> "Unable to retrieve RTP port info allocated by MGW for"</span><br><span>diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c</span><br><span>index 4466404..f944431 100644</span><br><span>--- a/src/osmo-bsc/bsc_subscr_conn_fsm.c</span><br><span>+++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c</span><br><span>@@ -39,9 +39,9 @@</span><br><span> #include <osmocom/bsc/abis_rsl.h></span><br><span> #include <osmocom/core/tdef.h></span><br><span> #include <osmocom/bsc/gsm_04_08_rr.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/bsc/mgw_endpoint_fsm.h></span><br><span> #include <osmocom/bsc/assignment_fsm.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/mgcp_client/mgcp_client_fsm.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/codec_pref.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/mgcp_client/mgcp_client_endpoint_fsm.h></span><br><span> #include <osmocom/core/byteswap.h></span><br><span> </span><br><span> #define S(x) (1 << (x))</span><br><span>@@ -457,8 +457,8 @@</span><br><span> /* Make sure a conn->user_plane.mgw_endpoint is allocated with the proper mgw endpoint name. For</span><br><span> * SCCPlite, pass in msc_assigned_cic the CIC received upon BSSMAP Assignment Command or BSSMAP Handover</span><br><span> * Request form the MSC (which is only stored in conn->user_plane after success). Ignored for AoIP. */</span><br><span style="color: hsl(0, 100%, 40%);">-struct mgw_endpoint *gscon_ensure_mgw_endpoint(struct gsm_subscriber_connection *conn,</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t msc_assigned_cic)</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_mgcpc_ep *gscon_ensure_mgw_endpoint(struct gsm_subscriber_connection *conn,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t msc_assigned_cic)</span><br><span> {</span><br><span> if (conn->user_plane.mgw_endpoint)</span><br><span> return conn->user_plane.mgw_endpoint;</span><br><span>@@ -466,19 +466,23 @@</span><br><span> if (gscon_is_sccplite(conn)) {</span><br><span> /* derive endpoint name from CIC on A interface side */</span><br><span> conn->user_plane.mgw_endpoint =</span><br><span style="color: hsl(0, 100%, 40%);">- mgw_endpoint_alloc(conn->fi, GSCON_EV_FORGET_MGW_ENDPOINT,</span><br><span style="color: hsl(0, 100%, 40%);">- conn->network->mgw.client, conn->fi->id,</span><br><span style="color: hsl(0, 100%, 40%);">- "%x@%s", msc_assigned_cic,</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_client_endpoint_domain(conn->network->mgw.client));</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mgcpc_ep_alloc(conn->fi, GSCON_EV_FORGET_MGW_ENDPOINT,</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->network->mgw.client,</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->network->mgw.tdefs,</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->fi->id,</span><br><span style="color: hsl(120, 100%, 40%);">+ "%x@%s", msc_assigned_cic,</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_client_endpoint_domain(conn->network->mgw.client));</span><br><span> LOGPFSML(conn->fi, LOGL_DEBUG, "MGW endpoint name derived from CIC 0x%x: %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- msc_assigned_cic, mgw_endpoint_name(conn->user_plane.mgw_endpoint));</span><br><span style="color: hsl(120, 100%, 40%);">+ msc_assigned_cic, osmo_mgcpc_ep_name(conn->user_plane.mgw_endpoint));</span><br><span> </span><br><span> } else if (gscon_is_aoip(conn)) {</span><br><span> /* use dynamic RTPBRIDGE endpoint allocation in MGW */</span><br><span> conn->user_plane.mgw_endpoint =</span><br><span style="color: hsl(0, 100%, 40%);">- mgw_endpoint_alloc(conn->fi, GSCON_EV_FORGET_MGW_ENDPOINT,</span><br><span style="color: hsl(0, 100%, 40%);">- conn->network->mgw.client, conn->fi->id,</span><br><span style="color: hsl(0, 100%, 40%);">- "%s", mgcp_client_rtpbridge_wildcard(conn->network->mgw.client));</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mgcpc_ep_alloc(conn->fi, GSCON_EV_FORGET_MGW_ENDPOINT,</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->network->mgw.client,</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->network->mgw.tdefs,</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->fi->id,</span><br><span style="color: hsl(120, 100%, 40%);">+ "%s", mgcp_client_rtpbridge_wildcard(conn->network->mgw.client));</span><br><span> } else {</span><br><span> LOGPFSML(conn->fi, LOGL_ERROR, "Conn is neither SCCPlite nor AoIP!?\n");</span><br><span> return NULL;</span><br><span>@@ -493,10 +497,10 @@</span><br><span> struct osmo_fsm_inst *notify,</span><br><span> uint32_t event_success, uint32_t event_failure,</span><br><span> void *notify_data,</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgwep_ci **created_ci)</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_mgcpc_ep_ci **created_ci)</span><br><span> {</span><br><span> int rc;</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgwep_ci *ci;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_mgcpc_ep_ci *ci;</span><br><span> struct mgcp_conn_peer mgw_info;</span><br><span> enum mgcp_verb verb;</span><br><span> </span><br><span>@@ -526,7 +530,7 @@</span><br><span> </span><br><span> ci = conn->user_plane.mgw_endpoint_ci_msc;</span><br><span> if (ci) {</span><br><span style="color: hsl(0, 100%, 40%);">- const struct mgcp_conn_peer *prev_crcx_info = mgwep_ci_get_rtp_info(ci);</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct mgcp_conn_peer *prev_crcx_info = osmo_mgcpc_ep_ci_get_rtp_info(ci);</span><br><span> </span><br><span> if (!conn->user_plane.mgw_endpoint) {</span><br><span> LOGPFSML(conn->fi, LOGL_ERROR, "Internal error: conn has a CI but no endoint\n");</span><br><span>@@ -536,14 +540,14 @@</span><br><span> if (!prev_crcx_info) {</span><br><span> LOGPFSML(conn->fi, LOGL_ERROR, "There already is an MGW connection for the MSC side,"</span><br><span> " but it seems to be broken. Will not CRCX another one (%s)\n",</span><br><span style="color: hsl(0, 100%, 40%);">- mgwep_ci_name(ci));</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mgcpc_ep_ci_name(ci));</span><br><span> return false;</span><br><span> }</span><br><span> </span><br><span> if (same_mgw_info(&mgw_info, prev_crcx_info)) {</span><br><span> LOGPFSML(conn->fi, LOGL_DEBUG,</span><br><span> "MSC side MGW endpoint ci is already configured to %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- mgwep_ci_name(ci));</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mgcpc_ep_ci_name(ci));</span><br><span> return true;</span><br><span> }</span><br><span> </span><br><span>@@ -559,7 +563,7 @@</span><br><span> }</span><br><span> </span><br><span> if (!ci) {</span><br><span style="color: hsl(0, 100%, 40%);">- ci = mgw_endpoint_ci_add(conn->user_plane.mgw_endpoint, "to-MSC");</span><br><span style="color: hsl(120, 100%, 40%);">+ ci = osmo_mgcpc_ep_ci_add(conn->user_plane.mgw_endpoint, "to-MSC");</span><br><span> if (created_ci)</span><br><span> *created_ci = ci;</span><br><span> conn->user_plane.mgw_endpoint_ci_msc = ci;</span><br><span>@@ -569,7 +573,7 @@</span><br><span> return false;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- mgw_endpoint_ci_request(ci, verb, &mgw_info, notify, event_success, event_failure, notify_data);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mgcpc_ep_ci_request(ci, verb, &mgw_info, notify, event_success, event_failure, notify_data);</span><br><span> return true;</span><br><span> }</span><br><span> </span><br><span>@@ -705,7 +709,7 @@</span><br><span> lchan_forget_mgw_endpoint(conn->ho.new_lchan);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void gscon_forget_mgw_endpoint_ci(struct gsm_subscriber_connection *conn, struct mgwep_ci *ci)</span><br><span style="color: hsl(120, 100%, 40%);">+void gscon_forget_mgw_endpoint_ci(struct gsm_subscriber_connection *conn, struct osmo_mgcpc_ep_ci *ci)</span><br><span> {</span><br><span> if (conn->ho.created_ci_for_msc == ci)</span><br><span> conn->ho.created_ci_for_msc = NULL;</span><br><span>@@ -734,7 +738,7 @@</span><br><span> * CLEAR COMPLETE message" */</span><br><span> </span><br><span> /* Close MGCP connections */</span><br><span style="color: hsl(0, 100%, 40%);">- mgw_endpoint_clear(conn->user_plane.mgw_endpoint);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mgcpc_ep_clear(conn->user_plane.mgw_endpoint);</span><br><span> </span><br><span> gscon_sigtran_send(conn, gsm0808_create_clear_complete());</span><br><span> break;</span><br><span>@@ -794,7 +798,7 @@</span><br><span> {</span><br><span> struct gsm_subscriber_connection *conn = fi->priv;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- mgw_endpoint_clear(conn->user_plane.mgw_endpoint);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mgcpc_ep_clear(conn->user_plane.mgw_endpoint);</span><br><span> </span><br><span> if (conn->lcls.fi) {</span><br><span> /* request termination of LCLS FSM */</span><br><span>diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c</span><br><span>index 3a6ddd4..dc97d12 100644</span><br><span>--- a/src/osmo-bsc/bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/bsc_vty.c</span><br><span>@@ -70,7 +70,7 @@</span><br><span> #include <osmocom/bsc/timeslot_fsm.h></span><br><span> #include <osmocom/bsc/lchan_fsm.h></span><br><span> #include <osmocom/bsc/lchan_select.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/bsc/mgw_endpoint_fsm.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/mgcp_client/mgcp_client_endpoint_fsm.h></span><br><span> </span><br><span> #include <inttypes.h></span><br><span> </span><br><span>@@ -1584,7 +1584,7 @@</span><br><span> {</span><br><span> vty_out(vty, "conn ID=%u, MSC=%u, hodec2_fail=%d, mgw_ep=%s%s",</span><br><span> conn->sccp.conn_id, conn->sccp.msc->nr, conn->hodec2.failures,</span><br><span style="color: hsl(0, 100%, 40%);">- mgw_endpoint_name(conn->user_plane.mgw_endpoint), VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mgcpc_ep_name(conn->user_plane.mgw_endpoint), VTY_NEWLINE);</span><br><span> if (conn->lcls.global_call_ref_len) {</span><br><span> vty_out(vty, " LCLS GCR: %s%s",</span><br><span> osmo_hexdump_nospc(conn->lcls.global_call_ref, conn->lcls.global_call_ref_len),</span><br><span>diff --git a/src/osmo-bsc/codec_pref.c b/src/osmo-bsc/codec_pref.c</span><br><span>index 412ed9a..3e06114 100644</span><br><span>--- a/src/osmo-bsc/codec_pref.c</span><br><span>+++ b/src/osmo-bsc/codec_pref.c</span><br><span>@@ -20,6 +20,8 @@</span><br><span> */</span><br><span> </span><br><span> #include <osmocom/core/msgb.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/mgcp_client/mgcp_client_fsm.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/netif/rtp.h></span><br><span> #include <osmocom/gsm/protocol/gsm_08_08.h></span><br><span> #include <osmocom/gsm/gsm0808_utils.h></span><br><span> #include <osmocom/bsc/bsc_msc_data.h></span><br><span>diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c</span><br><span>index fe3b8b2..0d1449f 100644</span><br><span>--- a/src/osmo-bsc/handover_fsm.c</span><br><span>+++ b/src/osmo-bsc/handover_fsm.c</span><br><span>@@ -25,6 +25,8 @@</span><br><span> #include <osmocom/gsm/rsl.h></span><br><span> #include <osmocom/gsm/gsm0808.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/mgcp_client/mgcp_client_endpoint_fsm.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #include <osmocom/bsc/debug.h></span><br><span> #include <osmocom/bsc/bsc_subscriber.h></span><br><span> </span><br><span>@@ -38,7 +40,6 @@</span><br><span> #include <osmocom/bsc/bsc_msc_data.h></span><br><span> #include <osmocom/bsc/osmo_bsc.h></span><br><span> #include <osmocom/bsc/osmo_bsc_lcls.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/bsc/mgw_endpoint_fsm.h></span><br><span> #include <osmocom/bsc/codec_pref.h></span><br><span> #include <osmocom/bsc/gsm_08_08.h></span><br><span> </span><br><span>@@ -240,7 +241,7 @@</span><br><span> </span><br><span> static void handover_reset(struct gsm_subscriber_connection *conn)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgwep_ci *ci;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_mgcpc_ep_ci *ci;</span><br><span> if (conn->ho.new_lchan)</span><br><span> /* New lchan was activated but never passed to a conn */</span><br><span> lchan_release(conn->ho.new_lchan, false, true, RSL_ERR_EQUIPMENT_FAIL);</span><br><span>@@ -250,7 +251,7 @@</span><br><span> gscon_forget_mgw_endpoint_ci(conn, ci);</span><br><span> /* If this is the last endpoint released, the mgw_endpoint_fsm will terminate and tell</span><br><span> * the gscon about it. */</span><br><span style="color: hsl(0, 100%, 40%);">- mgw_endpoint_ci_dlcx(ci);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mgcpc_ep_ci_dlcx(ci);</span><br><span> }</span><br><span> </span><br><span> conn->ho = (struct handover){</span><br><span>@@ -1074,7 +1075,7 @@</span><br><span> /* For AoIP, we created the MGW endpoint. Ensure it is really there, and log it. */</span><br><span> if (gscon_is_aoip(conn)) {</span><br><span> const struct mgcp_conn_peer *mgw_info;</span><br><span style="color: hsl(0, 100%, 40%);">- mgw_info = mgwep_ci_get_rtp_info(conn->user_plane.mgw_endpoint_ci_msc);</span><br><span style="color: hsl(120, 100%, 40%);">+ mgw_info = osmo_mgcpc_ep_ci_get_rtp_info(conn->user_plane.mgw_endpoint_ci_msc);</span><br><span> if (!mgw_info) {</span><br><span> ho_fail(HO_RESULT_ERROR,</span><br><span> "Unable to retrieve RTP port info allocated by MGW for"</span><br><span>diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c</span><br><span>index 33abb1f..f2fef99 100644</span><br><span>--- a/src/osmo-bsc/lchan_fsm.c</span><br><span>+++ b/src/osmo-bsc/lchan_fsm.c</span><br><span>@@ -24,11 +24,12 @@</span><br><span> #include <osmocom/core/byteswap.h></span><br><span> #include <osmocom/gsm/protocol/gsm_08_08.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/mgcp_client/mgcp_client_endpoint_fsm.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #include <osmocom/bsc/debug.h></span><br><span> #include <osmocom/bsc/lchan_fsm.h></span><br><span> #include <osmocom/bsc/lchan_rtp_fsm.h></span><br><span> #include <osmocom/bsc/timeslot_fsm.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/bsc/mgw_endpoint_fsm.h></span><br><span> #include <osmocom/bsc/bsc_subscr_conn_fsm.h></span><br><span> #include <osmocom/bsc/handover.h></span><br><span> #include <osmocom/bsc/abis_rsl.h></span><br><span>@@ -387,7 +388,7 @@</span><br><span> if (lchan->fi_rtp)</span><br><span> osmo_fsm_inst_term(lchan->fi_rtp, OSMO_FSM_TERM_REQUEST, 0);</span><br><span> if (lchan->mgw_endpoint_ci_bts) {</span><br><span style="color: hsl(0, 100%, 40%);">- mgw_endpoint_ci_dlcx(lchan->mgw_endpoint_ci_bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mgcpc_ep_ci_dlcx(lchan->mgw_endpoint_ci_bts);</span><br><span> lchan->mgw_endpoint_ci_bts = NULL;</span><br><span> }</span><br><span> </span><br><span>@@ -507,7 +508,7 @@</span><br><span> struct gsm_lchan *lchan = lchan_fi_lchan(fi);</span><br><span> struct gsm48_multi_rate_conf mr_conf;</span><br><span> struct gsm_bts *bts = lchan->ts->trx->bts;</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgwep_ci *use_mgwep_ci;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_mgcpc_ep_ci *use_mgwep_ci;</span><br><span> struct gsm_lchan *old_lchan = lchan->activate.info.re_use_mgw_endpoint_from_lchan;</span><br><span> struct lchan_activate_info *info = &lchan->activate.info;</span><br><span> </span><br><span>@@ -581,7 +582,7 @@</span><br><span> lchan_activate_mode_name(lchan->activate.info.activ_for),</span><br><span> lchan->activate.info.requires_voice_stream ? "yes" : "no",</span><br><span> lchan->activate.info.requires_voice_stream ?</span><br><span style="color: hsl(0, 100%, 40%);">- (use_mgwep_ci ? mgwep_ci_name(use_mgwep_ci) : "new")</span><br><span style="color: hsl(120, 100%, 40%);">+ (use_mgwep_ci ? osmo_mgcpc_ep_ci_name(use_mgwep_ci) : "new")</span><br><span> : "none",</span><br><span> gsm_lchant_name(lchan->type),</span><br><span> gsm48_chan_mode_name(lchan->tch_mode),</span><br><span>diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c</span><br><span>index 5e2d758..a5efa3d 100644</span><br><span>--- a/src/osmo-bsc/lchan_rtp_fsm.c</span><br><span>+++ b/src/osmo-bsc/lchan_rtp_fsm.c</span><br><span>@@ -21,11 +21,12 @@</span><br><span> */</span><br><span> </span><br><span> #include <osmocom/core/fsm.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/netif/rtp.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/mgcp_client/mgcp_client_endpoint_fsm.h></span><br><span> </span><br><span> #include <osmocom/bsc/gsm_data.h></span><br><span> #include <osmocom/bsc/lchan_fsm.h></span><br><span> #include <osmocom/bsc/lchan_rtp_fsm.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/bsc/mgw_endpoint_fsm.h></span><br><span> #include <osmocom/bsc/bsc_subscr_conn_fsm.h></span><br><span> #include <osmocom/bsc/abis_rsl.h></span><br><span> #include <osmocom/bsc/bsc_msc_data.h></span><br><span>@@ -120,7 +121,7 @@</span><br><span> /* While activating an lchan, for example for Handover, we may want to re-use another lchan's MGW</span><br><span> * endpoint CI. If Handover fails half way, the old lchan must keep its MGW endpoint CI, and we must not</span><br><span> * clean it up. Hence keep another lchan's mgw_endpoint_ci_bts out of lchan until all is done. */</span><br><span style="color: hsl(0, 100%, 40%);">-struct mgwep_ci *lchan_use_mgw_endpoint_ci_bts(struct gsm_lchan *lchan)</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_mgcpc_ep_ci *lchan_use_mgw_endpoint_ci_bts(struct gsm_lchan *lchan)</span><br><span> {</span><br><span> if (lchan->mgw_endpoint_ci_bts)</span><br><span> return lchan->mgw_endpoint_ci_bts;</span><br><span>@@ -135,13 +136,13 @@</span><br><span> uint32_t prev_state)</span><br><span> {</span><br><span> struct gsm_lchan *lchan = lchan_rtp_fi_lchan(fi);</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgw_endpoint *mgwep;</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgwep_ci *use_mgwep_ci = lchan_use_mgw_endpoint_ci_bts(lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_mgcpc_ep *mgwep;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_mgcpc_ep_ci *use_mgwep_ci = lchan_use_mgw_endpoint_ci_bts(lchan);</span><br><span> struct mgcp_conn_peer crcx_info = {};</span><br><span> </span><br><span> if (use_mgwep_ci) {</span><br><span> LOG_LCHAN_RTP(lchan, LOGL_DEBUG, "MGW endpoint already available: %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- mgwep_ci_name(use_mgwep_ci));</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mgcpc_ep_ci_name(use_mgwep_ci));</span><br><span> lchan_rtp_fsm_state_chg(LCHAN_RTP_ST_WAIT_LCHAN_READY);</span><br><span> return;</span><br><span> }</span><br><span>@@ -152,7 +153,7 @@</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- lchan->mgw_endpoint_ci_bts = mgw_endpoint_ci_add(mgwep, "to-BTS");</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->mgw_endpoint_ci_bts = osmo_mgcpc_ep_ci_add(mgwep, "to-BTS");</span><br><span> </span><br><span> if (lchan->conn) {</span><br><span> crcx_info.call_id = lchan->conn->sccp.conn_id;</span><br><span>@@ -162,7 +163,7 @@</span><br><span> crcx_info.ptime = 20;</span><br><span> mgcp_pick_codec(&crcx_info, lchan, true);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- mgw_endpoint_ci_request(lchan->mgw_endpoint_ci_bts, MGCP_VERB_CRCX, &crcx_info,</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mgcpc_ep_ci_request(lchan->mgw_endpoint_ci_bts, MGCP_VERB_CRCX, &crcx_info,</span><br><span> fi, LCHAN_RTP_EV_MGW_ENDPOINT_AVAILABLE, LCHAN_RTP_EV_MGW_ENDPOINT_ERROR,</span><br><span> 0);</span><br><span> }</span><br><span>@@ -174,7 +175,7 @@</span><br><span> </span><br><span> case LCHAN_RTP_EV_MGW_ENDPOINT_AVAILABLE:</span><br><span> LOG_LCHAN_RTP(lchan, LOGL_DEBUG, "MGW endpoint: %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- mgwep_ci_name(lchan_use_mgw_endpoint_ci_bts(lchan)));</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mgcpc_ep_ci_name(lchan_use_mgw_endpoint_ci_bts(lchan)));</span><br><span> lchan_rtp_fsm_state_chg(LCHAN_RTP_ST_WAIT_LCHAN_READY);</span><br><span> return;</span><br><span> </span><br><span>@@ -328,7 +329,7 @@</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- mgw_rtp = mgwep_ci_get_rtp_info(lchan_use_mgw_endpoint_ci_bts(lchan));</span><br><span style="color: hsl(120, 100%, 40%);">+ mgw_rtp = osmo_mgcpc_ep_ci_get_rtp_info(lchan_use_mgw_endpoint_ci_bts(lchan));</span><br><span> </span><br><span> if (!mgw_rtp) {</span><br><span> lchan_rtp_fail("Cannot send IPACC MDCX to BTS:"</span><br><span>@@ -396,7 +397,7 @@</span><br><span> }</span><br><span> </span><br><span> static void connect_mgw_endpoint_to_lchan(struct osmo_fsm_inst *fi,</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgwep_ci *ci,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_mgcpc_ep_ci *ci,</span><br><span> struct gsm_lchan *to_lchan)</span><br><span> {</span><br><span> int rc;</span><br><span>@@ -426,8 +427,8 @@</span><br><span> }</span><br><span> </span><br><span> LOG_LCHAN_RTP(lchan, LOGL_DEBUG, "Sending BTS side RTP port info %s:%u to MGW %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- mdcx_info.addr, mdcx_info.port, mgwep_ci_name(ci));</span><br><span style="color: hsl(0, 100%, 40%);">- mgw_endpoint_ci_request(ci, MGCP_VERB_MDCX, &mdcx_info,</span><br><span style="color: hsl(120, 100%, 40%);">+ mdcx_info.addr, mdcx_info.port, osmo_mgcpc_ep_ci_name(ci));</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mgcpc_ep_ci_request(ci, MGCP_VERB_MDCX, &mdcx_info,</span><br><span> fi, LCHAN_RTP_EV_MGW_ENDPOINT_CONFIGURED,</span><br><span> LCHAN_RTP_EV_MGW_ENDPOINT_ERROR, 0);</span><br><span> }</span><br><span>@@ -539,7 +540,7 @@</span><br><span> LOG_LCHAN_RTP(lchan, LOGL_ERROR,</span><br><span> "Error while connecting the MGW back to the old lchan's RTP port:"</span><br><span> " %s %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- mgwep_ci_name(lchan->mgw_endpoint_ci_bts),</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mgcpc_ep_ci_name(lchan->mgw_endpoint_ci_bts),</span><br><span> gsm_lchan_name(old_lchan));</span><br><span> osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, 0);</span><br><span> return;</span><br><span>@@ -575,7 +576,7 @@</span><br><span> case LCHAN_RTP_EV_IPACC_MDCX_ACK:</span><br><span> LOG_LCHAN_RTP(lchan, LOGL_NOTICE,</span><br><span> "Received MDCX ACK on established lchan's RTP port: %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- mgwep_ci_name(lchan->mgw_endpoint_ci_bts));</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mgcpc_ep_ci_name(lchan->mgw_endpoint_ci_bts));</span><br><span> return;</span><br><span> default:</span><br><span> OSMO_ASSERT(false);</span><br><span>@@ -740,7 +741,7 @@</span><br><span> {</span><br><span> struct gsm_lchan *lchan = lchan_rtp_fi_lchan(fi);</span><br><span> if (lchan->mgw_endpoint_ci_bts) {</span><br><span style="color: hsl(0, 100%, 40%);">- mgw_endpoint_ci_dlcx(lchan->mgw_endpoint_ci_bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mgcpc_ep_ci_dlcx(lchan->mgw_endpoint_ci_bts);</span><br><span> lchan->mgw_endpoint_ci_bts = NULL;</span><br><span> }</span><br><span> lchan->fi_rtp = NULL;</span><br><span>@@ -769,3 +770,86 @@</span><br><span> .timer_cb = lchan_rtp_fsm_timer_cb,</span><br><span> .cleanup = lchan_rtp_fsm_cleanup,</span><br><span> };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Depending on the channel mode and rate, return the codec type that is signalled towards the MGW. */</span><br><span style="color: hsl(120, 100%, 40%);">+static enum mgcp_codecs chan_mode_to_mgcp_codec(enum gsm48_chan_mode chan_mode, bool full_rate)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (chan_mode) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM48_CMODE_SPEECH_V1:</span><br><span style="color: hsl(120, 100%, 40%);">+ if (full_rate)</span><br><span style="color: hsl(120, 100%, 40%);">+ return CODEC_GSM_8000_1;</span><br><span style="color: hsl(120, 100%, 40%);">+ return CODEC_GSMHR_8000_1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM48_CMODE_SPEECH_EFR:</span><br><span style="color: hsl(120, 100%, 40%);">+ return CODEC_GSMEFR_8000_1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM48_CMODE_SPEECH_AMR:</span><br><span style="color: hsl(120, 100%, 40%);">+ return CODEC_AMR_8000_1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static int chan_mode_to_mgcp_bss_pt(enum mgcp_codecs codec)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (codec) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case CODEC_GSMHR_8000_1:</span><br><span style="color: hsl(120, 100%, 40%);">+ return RTP_PT_GSM_HALF;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ case CODEC_GSMEFR_8000_1:</span><br><span style="color: hsl(120, 100%, 40%);">+ return RTP_PT_GSM_EFR;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ case CODEC_AMR_8000_1:</span><br><span style="color: hsl(120, 100%, 40%);">+ return RTP_PT_AMR;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Not an error, we just leave it to libosmo-mgcp-client to</span><br><span style="color: hsl(120, 100%, 40%);">+ * decide over the PT. */</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void mgcp_pick_codec(struct mgcp_conn_peer *verb_info, const struct gsm_lchan *lchan, bool bss_side)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ enum mgcp_codecs codec = chan_mode_to_mgcp_codec(lchan->tch_mode,</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->type == GSM_LCHAN_TCH_H? false : true);</span><br><span style="color: hsl(120, 100%, 40%);">+ int custom_pt;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (codec < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_LCHAN(lchan, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Unable to determine MGCP codec type for %s in chan-mode %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm_lchant_name(lchan->type), gsm48_chan_mode_name(lchan->tch_mode));</span><br><span style="color: hsl(120, 100%, 40%);">+ verb_info->codecs_len = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ verb_info->codecs[0] = codec;</span><br><span style="color: hsl(120, 100%, 40%);">+ verb_info->codecs_len = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Setup custom payload types (only for BSS side and when required) */</span><br><span style="color: hsl(120, 100%, 40%);">+ custom_pt = chan_mode_to_mgcp_bss_pt(codec);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bss_side && custom_pt > 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ verb_info->ptmap[0].codec = codec;</span><br><span style="color: hsl(120, 100%, 40%);">+ verb_info->ptmap[0].pt = custom_pt;</span><br><span style="color: hsl(120, 100%, 40%);">+ verb_info->ptmap_len = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* AMR requires additional parameters to be set up (framing mode) */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (verb_info->codecs[0] == CODEC_AMR_8000_1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ verb_info->param_present = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ verb_info->param.amr_octet_aligned_present = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bss_side && verb_info->codecs[0] == CODEC_AMR_8000_1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* FIXME: At the moment all BTSs we support are using the</span><br><span style="color: hsl(120, 100%, 40%);">+ * octet-aligned payload format. However, in the future</span><br><span style="color: hsl(120, 100%, 40%);">+ * we may support BTSs that are using bandwith-efficient</span><br><span style="color: hsl(120, 100%, 40%);">+ * format. In this case we will have to add functionality</span><br><span style="color: hsl(120, 100%, 40%);">+ * that distinguishes by the BTS model which mode to use. */</span><br><span style="color: hsl(120, 100%, 40%);">+ verb_info->param.amr_octet_aligned = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (!bss_side && verb_info->codecs[0] == CODEC_AMR_8000_1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ verb_info->param.amr_octet_aligned = lchan->conn->sccp.msc->amr_octet_aligned;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/osmo-bsc/mgw_endpoint_fsm.c b/src/osmo-bsc/mgw_endpoint_fsm.c</span><br><span>deleted file mode 100644</span><br><span>index fa65166..0000000</span><br><span>--- a/src/osmo-bsc/mgw_endpoint_fsm.c</span><br><span>+++ /dev/null</span><br><span>@@ -1,795 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-/* osmo-bsc API to manage all sides of an MGW endpoint</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * (C) 2018 by sysmocom - s.f.m.c. GmbH <info@sysmocom.de></span><br><span style="color: hsl(0, 100%, 40%);">- * All Rights Reserved</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * Author: Neels Hofmeyr <neels@hofmeyr.de></span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(0, 100%, 40%);">- * it under the terms of the GNU Affero General Public License as published by</span><br><span style="color: hsl(0, 100%, 40%);">- * the Free Software Foundation; either version 3 of the License, or</span><br><span style="color: hsl(0, 100%, 40%);">- * (at your option) any later version.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(0, 100%, 40%);">- * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(0, 100%, 40%);">- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(0, 100%, 40%);">- * GNU Affero General Public License for more details.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * You should have received a copy of the GNU Affero General Public License</span><br><span style="color: hsl(0, 100%, 40%);">- * along with this program. If not, see <http://www.gnu.org/licenses/>.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <sys/socket.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <netinet/in.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <arpa/inet.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/core/fsm.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/core/byteswap.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/netif/rtp.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/bsc/debug.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/bsc/mgw_endpoint_fsm.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/bsc/lchan_fsm.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/bsc/gsm_data.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/bsc/bsc_msc_data.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#define LOG_CI(ci, level, fmt, args...) do { \</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ci || !ci->mgwep) \</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLGLOBAL, level, "(unknown MGW endpoint) " fmt, ## args); \</span><br><span style="color: hsl(0, 100%, 40%);">- else \</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_MGWEP(ci->mgwep, level, "CI[%d] %s%s%s: " fmt, \</span><br><span style="color: hsl(0, 100%, 40%);">- (int)(ci - ci->mgwep->ci), \</span><br><span style="color: hsl(0, 100%, 40%);">- ci->label ? : "-", \</span><br><span style="color: hsl(0, 100%, 40%);">- ci->mgcp_ci_str[0] ? " CI=" : "", \</span><br><span style="color: hsl(0, 100%, 40%);">- ci->mgcp_ci_str[0] ? ci->mgcp_ci_str : "", \</span><br><span style="color: hsl(0, 100%, 40%);">- ## args); \</span><br><span style="color: hsl(0, 100%, 40%);">- } while(0)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#define LOG_CI_VERB(ci, level, fmt, args...) do { \</span><br><span style="color: hsl(0, 100%, 40%);">- if (ci->verb_info.addr) \</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_CI(ci, level, "%s %s:%u: " fmt, \</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_verb_name(ci->verb), ci->verb_info.addr, ci->verb_info.port, \</span><br><span style="color: hsl(0, 100%, 40%);">- ## args); \</span><br><span style="color: hsl(0, 100%, 40%);">- else \</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_CI(ci, level, "%s: " fmt, \</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_verb_name(ci->verb), \</span><br><span style="color: hsl(0, 100%, 40%);">- ## args); \</span><br><span style="color: hsl(0, 100%, 40%);">- } while(0)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#define FIRST_CI_EVENT (_MGWEP_EV_LAST + (_MGWEP_EV_LAST & 1)) /* rounded up to even nr */</span><br><span style="color: hsl(0, 100%, 40%);">-#define USABLE_CI ((32 - FIRST_CI_EVENT)/2)</span><br><span style="color: hsl(0, 100%, 40%);">-#define EV_TO_CI_IDX(event) ((event - FIRST_CI_EVENT) / 2)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#define CI_EV_SUCCESS(ci) (FIRST_CI_EVENT + (((ci) - ci->mgwep->ci) * 2))</span><br><span style="color: hsl(0, 100%, 40%);">-#define CI_EV_FAILURE(ci) (CI_EV_SUCCESS(ci) + 1)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static struct osmo_fsm mgwep_fsm;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-struct mgwep_ci {</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgw_endpoint *mgwep;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- bool occupied;</span><br><span style="color: hsl(0, 100%, 40%);">- char label[64];</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_fsm_inst *mgcp_client_fi;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- bool pending;</span><br><span style="color: hsl(0, 100%, 40%);">- bool sent;</span><br><span style="color: hsl(0, 100%, 40%);">- enum mgcp_verb verb;</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgcp_conn_peer verb_info;</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_fsm_inst *notify;</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t notify_success;</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t notify_failure;</span><br><span style="color: hsl(0, 100%, 40%);">- void *notify_data;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- bool got_port_info;</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgcp_conn_peer rtp_info;</span><br><span style="color: hsl(0, 100%, 40%);">- char mgcp_ci_str[MGCP_CONN_ID_LENGTH];</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-struct mgw_endpoint {</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgcp_client *mgcp_client;</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_fsm_inst *fi;</span><br><span style="color: hsl(0, 100%, 40%);">- char endpoint[MGCP_ENDPOINT_MAXLEN];</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgwep_ci ci[USABLE_CI];</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static const struct value_string mgcp_verb_names[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- { MGCP_VERB_CRCX, "CRCX" },</span><br><span style="color: hsl(0, 100%, 40%);">- { MGCP_VERB_MDCX, "MDCX" },</span><br><span style="color: hsl(0, 100%, 40%);">- { MGCP_VERB_DLCX, "DLCX" },</span><br><span style="color: hsl(0, 100%, 40%);">- { MGCP_VERB_AUEP, "AUEP" },</span><br><span style="color: hsl(0, 100%, 40%);">- { MGCP_VERB_RSIP, "RSIP" },</span><br><span style="color: hsl(0, 100%, 40%);">- {}</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static inline const char *mgcp_verb_name(enum mgcp_verb val)</span><br><span style="color: hsl(0, 100%, 40%);">-{ return get_value_string(mgcp_verb_names, val); }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static struct mgwep_ci *mgwep_check_ci(struct mgwep_ci *ci)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ci)</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ci->mgwep)</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- if (ci < ci->mgwep->ci || ci >= &ci->mgwep->ci[USABLE_CI])</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- return ci;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static struct mgwep_ci *mgwep_ci_for_event(struct mgw_endpoint *mgwep, uint32_t event)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int idx;</span><br><span style="color: hsl(0, 100%, 40%);">- if (event < FIRST_CI_EVENT)</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- idx = EV_TO_CI_IDX(event);</span><br><span style="color: hsl(0, 100%, 40%);">- if (idx >= sizeof(mgwep->ci))</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- return mgwep_check_ci(&mgwep->ci[idx]);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-const char *mgw_endpoint_name(const struct mgw_endpoint *mgwep)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- if (!mgwep)</span><br><span style="color: hsl(0, 100%, 40%);">- return "NULL";</span><br><span style="color: hsl(0, 100%, 40%);">- if (mgwep->endpoint[0])</span><br><span style="color: hsl(0, 100%, 40%);">- return mgwep->endpoint;</span><br><span style="color: hsl(0, 100%, 40%);">- return osmo_fsm_inst_name(mgwep->fi);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-const char *mgcp_conn_peer_name(const struct mgcp_conn_peer *info)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- /* I'd be fine with a smaller buffer and accept truncation, but gcc possibly refuses to build if</span><br><span style="color: hsl(0, 100%, 40%);">- * this buffer is too small. */</span><br><span style="color: hsl(0, 100%, 40%);">- static char buf[1024];</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (!info)</span><br><span style="color: hsl(0, 100%, 40%);">- return "NULL";</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (info->endpoint[0]</span><br><span style="color: hsl(0, 100%, 40%);">- && info->addr[0])</span><br><span style="color: hsl(0, 100%, 40%);">- snprintf(buf, sizeof(buf), "%s:%s:%u",</span><br><span style="color: hsl(0, 100%, 40%);">- info->endpoint, info->addr, info->port);</span><br><span style="color: hsl(0, 100%, 40%);">- else if (info->endpoint[0])</span><br><span style="color: hsl(0, 100%, 40%);">- snprintf(buf, sizeof(buf), "%s", info->endpoint);</span><br><span style="color: hsl(0, 100%, 40%);">- else if (info->addr[0])</span><br><span style="color: hsl(0, 100%, 40%);">- snprintf(buf, sizeof(buf), "%s:%u", info->addr, info->port);</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- return "empty";</span><br><span style="color: hsl(0, 100%, 40%);">- return buf;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-const char *mgwep_ci_name(const struct mgwep_ci *ci)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- const struct mgcp_conn_peer *rtp_info;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ci)</span><br><span style="color: hsl(0, 100%, 40%);">- return "NULL";</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- rtp_info = mgwep_ci_get_rtp_info(ci);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (rtp_info)</span><br><span style="color: hsl(0, 100%, 40%);">- return mgcp_conn_peer_name(rtp_info);</span><br><span style="color: hsl(0, 100%, 40%);">- return mgw_endpoint_name(ci->mgwep);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static struct value_string mgwep_fsm_event_names[33] = {};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static char mgwep_fsm_event_name_bufs[32][32] = {};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static void fill_event_names()</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int i;</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < (ARRAY_SIZE(mgwep_fsm_event_names) - 1); i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (i < _MGWEP_EV_LAST)</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">- if (i < FIRST_CI_EVENT || EV_TO_CI_IDX(i) > USABLE_CI) {</span><br><span style="color: hsl(0, 100%, 40%);">- mgwep_fsm_event_names[i] = (struct value_string){i, "Unused"};</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- snprintf(mgwep_fsm_event_name_bufs[i], sizeof(mgwep_fsm_event_name_bufs[i]),</span><br><span style="color: hsl(0, 100%, 40%);">- "MGW Response for CI #%d", EV_TO_CI_IDX(i));</span><br><span style="color: hsl(0, 100%, 40%);">- mgwep_fsm_event_names[i] = (struct value_string){i, mgwep_fsm_event_name_bufs[i]};</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static struct osmo_tdef *g_T_defs = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void mgw_endpoint_fsm_init(struct osmo_tdef *T_defs)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- g_T_defs = T_defs;</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(osmo_fsm_register(&mgwep_fsm) == 0);</span><br><span style="color: hsl(0, 100%, 40%);">- fill_event_names();</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-struct mgw_endpoint *mgwep_fi_mgwep(struct osmo_fsm_inst *fi)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(fi);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(fi->fsm == &mgwep_fsm);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(fi->priv);</span><br><span style="color: hsl(0, 100%, 40%);">- return fi->priv;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-struct mgw_endpoint *mgw_endpoint_alloc(struct osmo_fsm_inst *parent, uint32_t parent_term_event,</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgcp_client *mgcp_client,</span><br><span style="color: hsl(0, 100%, 40%);">- const char *fsm_id,</span><br><span style="color: hsl(0, 100%, 40%);">- const char *endpoint_str_fmt, ...)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- va_list ap;</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_fsm_inst *fi;</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgw_endpoint *mgwep;</span><br><span style="color: hsl(0, 100%, 40%);">- int rc;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (!mgcp_client)</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* use mgcp_client as talloc ctx, so that the conn, lchan, ts can deallocate while MGCP DLCX are</span><br><span style="color: hsl(0, 100%, 40%);">- * still going on. */</span><br><span style="color: hsl(0, 100%, 40%);">- fi = osmo_fsm_inst_alloc_child(&mgwep_fsm, parent, parent_term_event);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(fi);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_update_id(fi, fsm_id);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- mgwep = talloc_zero(fi, struct mgw_endpoint);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(mgwep);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- mgwep->mgcp_client = mgcp_client;</span><br><span style="color: hsl(0, 100%, 40%);">- mgwep->fi = fi;</span><br><span style="color: hsl(0, 100%, 40%);">- mgwep->fi->priv = mgwep;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- va_start(ap, endpoint_str_fmt);</span><br><span style="color: hsl(0, 100%, 40%);">- rc = vsnprintf(mgwep->endpoint, sizeof(mgwep->endpoint), endpoint_str_fmt, ap);</span><br><span style="color: hsl(0, 100%, 40%);">- va_end(ap);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc <= 0 || rc >= sizeof(mgwep->endpoint)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_MGWEP(mgwep, LOGL_ERROR, "Endpoint name too long or too short: %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- mgwep->endpoint);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_term(mgwep->fi, OSMO_FSM_TERM_ERROR, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return mgwep;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-struct mgwep_ci *mgw_endpoint_ci_add(struct mgw_endpoint *mgwep,</span><br><span style="color: hsl(0, 100%, 40%);">- const char *label_fmt, ...)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- va_list ap;</span><br><span style="color: hsl(0, 100%, 40%);">- int i;</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgwep_ci *ci;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < USABLE_CI; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- ci = &mgwep->ci[i];</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (ci->occupied || ci->mgcp_client_fi)</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- *ci = (struct mgwep_ci){</span><br><span style="color: hsl(0, 100%, 40%);">- .mgwep = mgwep,</span><br><span style="color: hsl(0, 100%, 40%);">- .occupied = true,</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- if (label_fmt) {</span><br><span style="color: hsl(0, 100%, 40%);">- va_start(ap, label_fmt);</span><br><span style="color: hsl(0, 100%, 40%);">- vsnprintf(ci->label, sizeof(ci->label), label_fmt, ap);</span><br><span style="color: hsl(0, 100%, 40%);">- va_end(ap);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- return ci;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_MGWEP(mgwep, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "Cannot allocate another endpoint, all "</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_STRINGIFY_VAL(USABLE_CI) " are in use\n");</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static void mgwep_fsm_check_state_chg_after_response(struct osmo_fsm_inst *fi);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static void on_failure(struct mgwep_ci *ci)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ci->occupied)</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (ci->notify)</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(ci->notify, ci->notify_failure, ci->notify_data);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- *ci = (struct mgwep_ci){</span><br><span style="color: hsl(0, 100%, 40%);">- .mgwep = ci->mgwep,</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- mgwep_fsm_check_state_chg_after_response(ci->mgwep->fi);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static void on_success(struct mgwep_ci *ci, void *data)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgcp_conn_peer *rtp_info;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ci->occupied)</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ci->pending = false;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- switch (ci->verb) {</span><br><span style="color: hsl(0, 100%, 40%);">- case MGCP_VERB_CRCX:</span><br><span style="color: hsl(0, 100%, 40%);">- /* If we sent a wildcarded endpoint name on CRCX, we need to store the resulting endpoint</span><br><span style="color: hsl(0, 100%, 40%);">- * name here. Also, we receive the MGW's RTP port information. */</span><br><span style="color: hsl(0, 100%, 40%);">- rtp_info = data;</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(rtp_info);</span><br><span style="color: hsl(0, 100%, 40%);">- ci->got_port_info = true;</span><br><span style="color: hsl(0, 100%, 40%);">- ci->rtp_info = *rtp_info;</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_strlcpy(ci->mgcp_ci_str, mgcp_conn_get_ci(ci->mgcp_client_fi),</span><br><span style="color: hsl(0, 100%, 40%);">- sizeof(ci->mgcp_ci_str));</span><br><span style="color: hsl(0, 100%, 40%);">- if (rtp_info->endpoint[0]) {</span><br><span style="color: hsl(0, 100%, 40%);">- int rc;</span><br><span style="color: hsl(0, 100%, 40%);">- rc = osmo_strlcpy(ci->mgwep->endpoint, rtp_info->endpoint,</span><br><span style="color: hsl(0, 100%, 40%);">- sizeof(ci->mgwep->endpoint));</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc <= 0 || rc >= sizeof(ci->mgwep->endpoint)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_CI(ci, LOGL_ERROR, "Unable to copy endpoint name '%s'\n",</span><br><span style="color: hsl(0, 100%, 40%);">- rtp_info->endpoint);</span><br><span style="color: hsl(0, 100%, 40%);">- mgw_endpoint_ci_dlcx(ci);</span><br><span style="color: hsl(0, 100%, 40%);">- on_failure(ci);</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_CI(ci, LOGL_DEBUG, "received successful response to %s RTP=%s%s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_verb_name(ci->verb),</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_conn_peer_name(ci->got_port_info? &ci->rtp_info : NULL),</span><br><span style="color: hsl(0, 100%, 40%);">- ci->notify ? "" : " (not sending a notification)");</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (ci->notify)</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(ci->notify, ci->notify_success, ci->notify_data);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- mgwep_fsm_check_state_chg_after_response(ci->mgwep->fi);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-const struct mgcp_conn_peer *mgwep_ci_get_rtp_info(const struct mgwep_ci *ci)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- ci = mgwep_check_ci((struct mgwep_ci*)ci);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ci)</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ci->got_port_info)</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- return &ci->rtp_info;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-bool mgwep_ci_get_crcx_info_to_sockaddr(const struct mgwep_ci *ci, struct sockaddr_storage *dest)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- const struct mgcp_conn_peer *rtp_info;</span><br><span style="color: hsl(0, 100%, 40%);">- struct sockaddr_in *sin;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- rtp_info = mgwep_ci_get_rtp_info(ci);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!rtp_info)</span><br><span style="color: hsl(0, 100%, 40%);">- return false;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- sin = (struct sockaddr_in *)dest;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- sin->sin_family = AF_INET;</span><br><span style="color: hsl(0, 100%, 40%);">- sin->sin_addr.s_addr = inet_addr(rtp_info->addr);</span><br><span style="color: hsl(0, 100%, 40%);">- sin->sin_port = osmo_ntohs(rtp_info->port);</span><br><span style="color: hsl(0, 100%, 40%);">- return true;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static const struct osmo_tdef_state_timeout mgwep_fsm_timeouts[32] = {</span><br><span style="color: hsl(0, 100%, 40%);">- [MGWEP_ST_WAIT_MGW_RESPONSE] = { .T=23042 },</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* Transition to a state, using the T timer defined in assignment_fsm_timeouts.</span><br><span style="color: hsl(0, 100%, 40%);">- * The actual timeout value is in turn obtained from g_T_defs.</span><br><span style="color: hsl(0, 100%, 40%);">- * Assumes local variable fi exists. */</span><br><span style="color: hsl(0, 100%, 40%);">-#define mgwep_fsm_state_chg(state) \</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_tdef_fsm_inst_state_chg(fi, state, mgwep_fsm_timeouts, g_T_defs, 5)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void mgw_endpoint_ci_request(struct mgwep_ci *ci,</span><br><span style="color: hsl(0, 100%, 40%);">- enum mgcp_verb verb, const struct mgcp_conn_peer *verb_info,</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_fsm_inst *notify,</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t event_success, uint32_t event_failure,</span><br><span style="color: hsl(0, 100%, 40%);">- void *notify_data)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgw_endpoint *mgwep;</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_fsm_inst *fi;</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgwep_ci cleared_ci;</span><br><span style="color: hsl(0, 100%, 40%);">- ci = mgwep_check_ci(ci);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ci) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLGLOBAL, LOGL_ERROR, "Invalid MGW endpoint request: no ci\n");</span><br><span style="color: hsl(0, 100%, 40%);">- goto dispatch_error;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (!verb_info && verb != MGCP_VERB_DLCX) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_CI(ci, LOGL_ERROR, "Invalid MGW endpoint request: missing verb details for %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_verb_name(verb));</span><br><span style="color: hsl(0, 100%, 40%);">- goto dispatch_error;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if ((verb < 0) || (verb > MGCP_VERB_RSIP)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_CI(ci, LOGL_ERROR, "Invalid MGW endpoint request: unknown verb: %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_verb_name(verb));</span><br><span style="color: hsl(0, 100%, 40%);">- goto dispatch_error;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- mgwep = ci->mgwep;</span><br><span style="color: hsl(0, 100%, 40%);">- fi = mgwep->fi;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Clear volatile state by explicitly keeping those that should remain. Because we can't assign</span><br><span style="color: hsl(0, 100%, 40%);">- * the char[] directly, dance through cleared_ci and copy back. */</span><br><span style="color: hsl(0, 100%, 40%);">- cleared_ci = (struct mgwep_ci){</span><br><span style="color: hsl(0, 100%, 40%);">- .mgwep = mgwep,</span><br><span style="color: hsl(0, 100%, 40%);">- .mgcp_client_fi = ci->mgcp_client_fi,</span><br><span style="color: hsl(0, 100%, 40%);">- .got_port_info = ci->got_port_info,</span><br><span style="color: hsl(0, 100%, 40%);">- .rtp_info = ci->rtp_info,</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- .occupied = true,</span><br><span style="color: hsl(0, 100%, 40%);">- /* .pending = true follows below */</span><br><span style="color: hsl(0, 100%, 40%);">- .verb = verb,</span><br><span style="color: hsl(0, 100%, 40%);">- .notify = notify,</span><br><span style="color: hsl(0, 100%, 40%);">- .notify_success = event_success,</span><br><span style="color: hsl(0, 100%, 40%);">- .notify_failure = event_failure,</span><br><span style="color: hsl(0, 100%, 40%);">- .notify_data = notify_data,</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_strlcpy(cleared_ci.label, ci->label, sizeof(cleared_ci.label));</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_strlcpy(cleared_ci.mgcp_ci_str, ci->mgcp_ci_str, sizeof(cleared_ci.mgcp_ci_str));</span><br><span style="color: hsl(0, 100%, 40%);">- *ci = cleared_ci;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_CI_VERB(ci, LOGL_DEBUG, "notify=%s\n", osmo_fsm_inst_name(ci->notify));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (verb_info)</span><br><span style="color: hsl(0, 100%, 40%);">- ci->verb_info = *verb_info;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (mgwep->endpoint[0]) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (ci->verb_info.endpoint[0] && strcmp(ci->verb_info.endpoint, mgwep->endpoint))</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_CI(ci, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "Warning: Requested %s on endpoint %s, but this CI is on endpoint %s."</span><br><span style="color: hsl(0, 100%, 40%);">- " Using the proper endpoint instead.\n",</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_verb_name(verb), ci->verb_info.endpoint, mgwep->endpoint);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_strlcpy(ci->verb_info.endpoint, mgwep->endpoint, sizeof(ci->verb_info.endpoint));</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- switch (ci->verb) {</span><br><span style="color: hsl(0, 100%, 40%);">- case MGCP_VERB_CRCX:</span><br><span style="color: hsl(0, 100%, 40%);">- if (ci->mgcp_client_fi) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_CI(ci, LOGL_ERROR, "CRCX can be called only once per MGW endpoint CI\n");</span><br><span style="color: hsl(0, 100%, 40%);">- on_failure(ci);</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- case MGCP_VERB_MDCX:</span><br><span style="color: hsl(0, 100%, 40%);">- case MGCP_VERB_DLCX:</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ci->mgcp_client_fi) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_CI_VERB(ci, LOGL_ERROR, "The first verb on an unused MGW endpoint CI must be CRCX, not %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_verb_name(ci->verb));</span><br><span style="color: hsl(0, 100%, 40%);">- on_failure(ci);</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_CI(ci, LOGL_ERROR, "This verb is not supported: %s\n", mgcp_verb_name(ci->verb));</span><br><span style="color: hsl(0, 100%, 40%);">- on_failure(ci);</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ci->pending = true;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_CI_VERB(ci, LOGL_DEBUG, "Scheduling\n");</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (mgwep->fi->state != MGWEP_ST_WAIT_MGW_RESPONSE)</span><br><span style="color: hsl(0, 100%, 40%);">- mgwep_fsm_state_chg(MGWEP_ST_WAIT_MGW_RESPONSE);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">-dispatch_error:</span><br><span style="color: hsl(0, 100%, 40%);">- if (notify)</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(notify, event_failure, notify_data);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static int send_verb(struct mgwep_ci *ci)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int rc;</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgw_endpoint *mgwep = ci->mgwep;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ci->occupied || !ci->pending || ci->sent)</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- switch (ci->verb) {</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- case MGCP_VERB_CRCX:</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(!ci->mgcp_client_fi);</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_CI_VERB(ci, LOGL_DEBUG, "Sending\n");</span><br><span style="color: hsl(0, 100%, 40%);">- ci->mgcp_client_fi = mgcp_conn_create(mgwep->mgcp_client, mgwep->fi,</span><br><span style="color: hsl(0, 100%, 40%);">- CI_EV_FAILURE(ci), CI_EV_SUCCESS(ci),</span><br><span style="color: hsl(0, 100%, 40%);">- &ci->verb_info);</span><br><span style="color: hsl(0, 100%, 40%);">- ci->sent = true;</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ci->mgcp_client_fi){</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_CI_VERB(ci, LOGL_ERROR, "Cannot send\n");</span><br><span style="color: hsl(0, 100%, 40%);">- on_failure(ci);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_update_id(ci->mgcp_client_fi, ci->label);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- case MGCP_VERB_MDCX:</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(ci->mgcp_client_fi);</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_CI_VERB(ci, LOGL_DEBUG, "Sending\n");</span><br><span style="color: hsl(0, 100%, 40%);">- rc = mgcp_conn_modify(ci->mgcp_client_fi, CI_EV_SUCCESS(ci), &ci->verb_info);</span><br><span style="color: hsl(0, 100%, 40%);">- ci->sent = true;</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_CI_VERB(ci, LOGL_ERROR, "Cannot send (rc=%d %s)\n", rc, strerror(-rc));</span><br><span style="color: hsl(0, 100%, 40%);">- on_failure(ci);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- case MGCP_VERB_DLCX:</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_CI(ci, LOGL_DEBUG, "Sending MGCP: %s %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_verb_name(ci->verb), ci->mgcp_ci_str);</span><br><span style="color: hsl(0, 100%, 40%);">- /* The way this is designed, we actually need to forget all about the ci right away. */</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_conn_delete(ci->mgcp_client_fi);</span><br><span style="color: hsl(0, 100%, 40%);">- if (ci->notify)</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(ci->notify, ci->notify_success, ci->notify_data);</span><br><span style="color: hsl(0, 100%, 40%);">- *ci = (struct mgwep_ci){</span><br><span style="color: hsl(0, 100%, 40%);">- .mgwep = mgwep,</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(false);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return 1;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void mgw_endpoint_clear(struct mgw_endpoint *mgwep)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- if (!mgwep)</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_term(mgwep->fi, OSMO_FSM_TERM_REGULAR, 0);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static void mgwep_count(struct mgw_endpoint *mgwep, int *occupied, int *pending_not_sent,</span><br><span style="color: hsl(0, 100%, 40%);">- int *waiting_for_response)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int i;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (occupied)</span><br><span style="color: hsl(0, 100%, 40%);">- *occupied = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (pending_not_sent)</span><br><span style="color: hsl(0, 100%, 40%);">- *pending_not_sent = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (waiting_for_response)</span><br><span style="color: hsl(0, 100%, 40%);">- *waiting_for_response = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < ARRAY_SIZE(mgwep->ci); i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgwep_ci *ci = &mgwep->ci[i];</span><br><span style="color: hsl(0, 100%, 40%);">- if (ci->occupied) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (occupied)</span><br><span style="color: hsl(0, 100%, 40%);">- (*occupied)++;</span><br><span style="color: hsl(0, 100%, 40%);">- } else</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (ci->pending)</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_CI_VERB(ci, LOGL_DEBUG, "%s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- ci->sent ? "waiting for response" : "waiting to be sent");</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_CI_VERB(ci, LOGL_DEBUG, "%s\n", mgcp_conn_peer_name(mgwep_ci_get_rtp_info(ci)));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (ci->pending && ci->sent)</span><br><span style="color: hsl(0, 100%, 40%);">- if (waiting_for_response)</span><br><span style="color: hsl(0, 100%, 40%);">- (*waiting_for_response)++;</span><br><span style="color: hsl(0, 100%, 40%);">- if (ci->pending && !ci->sent)</span><br><span style="color: hsl(0, 100%, 40%);">- if (pending_not_sent)</span><br><span style="color: hsl(0, 100%, 40%);">- (*pending_not_sent)++;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static void mgwep_fsm_check_state_chg_after_response(struct osmo_fsm_inst *fi)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int waiting_for_response;</span><br><span style="color: hsl(0, 100%, 40%);">- int occupied;</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgw_endpoint *mgwep = mgwep_fi_mgwep(fi);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- mgwep_count(mgwep, &occupied, NULL, &waiting_for_response);</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_MGWEP(mgwep, LOGL_DEBUG, "CI in use: %d, waiting for response: %d\n", occupied, waiting_for_response);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (!occupied) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* All CI have been released. The endpoint no longer exists. Notify the parent FSM, by</span><br><span style="color: hsl(0, 100%, 40%);">- * terminating. */</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REGULAR, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (!waiting_for_response) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (fi->state != MGWEP_ST_IN_USE)</span><br><span style="color: hsl(0, 100%, 40%);">- mgwep_fsm_state_chg(MGWEP_ST_IN_USE);</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static void mgwep_fsm_wait_mgw_response_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int count = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- int i;</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgw_endpoint *mgwep = mgwep_fi_mgwep(fi);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < ARRAY_SIZE(mgwep->ci); i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- count += send_verb(&mgwep->ci[i]);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_MGWEP(mgwep, LOGL_DEBUG, "Sent messages: %d\n", count);</span><br><span style="color: hsl(0, 100%, 40%);">- mgwep_fsm_check_state_chg_after_response(fi);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static void mgwep_fsm_handle_ci_events(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgwep_ci *ci;</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgw_endpoint *mgwep = mgwep_fi_mgwep(fi);</span><br><span style="color: hsl(0, 100%, 40%);">- ci = mgwep_ci_for_event(mgwep, event);</span><br><span style="color: hsl(0, 100%, 40%);">- if (ci) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (event == CI_EV_SUCCESS(ci))</span><br><span style="color: hsl(0, 100%, 40%);">- on_success(ci, data);</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- on_failure(ci);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static void mgwep_fsm_in_use_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int pending_not_sent;</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgw_endpoint *mgwep = mgwep_fi_mgwep(fi);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- mgwep_count(mgwep, NULL, &pending_not_sent, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- if (pending_not_sent)</span><br><span style="color: hsl(0, 100%, 40%);">- mgwep_fsm_state_chg(MGWEP_ST_WAIT_MGW_RESPONSE);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#define S(x) (1 << (x))</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static const struct osmo_fsm_state mgwep_fsm_states[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- [MGWEP_ST_UNUSED] = {</span><br><span style="color: hsl(0, 100%, 40%);">- .name = "UNUSED",</span><br><span style="color: hsl(0, 100%, 40%);">- .in_event_mask = 0,</span><br><span style="color: hsl(0, 100%, 40%);">- .out_state_mask = 0</span><br><span style="color: hsl(0, 100%, 40%);">- | S(MGWEP_ST_WAIT_MGW_RESPONSE)</span><br><span style="color: hsl(0, 100%, 40%);">- ,</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">- [MGWEP_ST_WAIT_MGW_RESPONSE] = {</span><br><span style="color: hsl(0, 100%, 40%);">- .name = "WAIT_MGW_RESPONSE",</span><br><span style="color: hsl(0, 100%, 40%);">- .onenter = mgwep_fsm_wait_mgw_response_onenter,</span><br><span style="color: hsl(0, 100%, 40%);">- .action = mgwep_fsm_handle_ci_events,</span><br><span style="color: hsl(0, 100%, 40%);">- .in_event_mask = 0xffffffff,</span><br><span style="color: hsl(0, 100%, 40%);">- .out_state_mask = 0</span><br><span style="color: hsl(0, 100%, 40%);">- | S(MGWEP_ST_IN_USE)</span><br><span style="color: hsl(0, 100%, 40%);">- ,</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">- [MGWEP_ST_IN_USE] = {</span><br><span style="color: hsl(0, 100%, 40%);">- .name = "IN_USE",</span><br><span style="color: hsl(0, 100%, 40%);">- .onenter = mgwep_fsm_in_use_onenter,</span><br><span style="color: hsl(0, 100%, 40%);">- .action = mgwep_fsm_handle_ci_events,</span><br><span style="color: hsl(0, 100%, 40%);">- .in_event_mask = 0xffffffff, /* mgcp_client_fsm may send parent term anytime */</span><br><span style="color: hsl(0, 100%, 40%);">- .out_state_mask = 0</span><br><span style="color: hsl(0, 100%, 40%);">- | S(MGWEP_ST_WAIT_MGW_RESPONSE)</span><br><span style="color: hsl(0, 100%, 40%);">- ,</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static int mgwep_fsm_timer_cb(struct osmo_fsm_inst *fi)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int i;</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgw_endpoint *mgwep = mgwep_fi_mgwep(fi);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- switch (fi->T) {</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < ARRAY_SIZE(mgwep->ci); i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgwep_ci *ci = &mgwep->ci[i];</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ci->occupied)</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">- if (!(ci->pending && ci->sent))</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">- on_failure(ci);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static struct osmo_fsm mgwep_fsm = {</span><br><span style="color: hsl(0, 100%, 40%);">- .name = "mgw-endpoint",</span><br><span style="color: hsl(0, 100%, 40%);">- .states = mgwep_fsm_states,</span><br><span style="color: hsl(0, 100%, 40%);">- .num_states = ARRAY_SIZE(mgwep_fsm_states),</span><br><span style="color: hsl(0, 100%, 40%);">- .log_subsys = DRSL,</span><br><span style="color: hsl(0, 100%, 40%);">- .event_names = mgwep_fsm_event_names,</span><br><span style="color: hsl(0, 100%, 40%);">- .timer_cb = mgwep_fsm_timer_cb,</span><br><span style="color: hsl(0, 100%, 40%);">- /* The FSM termination will automatically trigger any mgcp_client_fsm instances to DLCX. */</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* Depending on the channel mode and rate, return the codec type that is signalled towards the MGW. */</span><br><span style="color: hsl(0, 100%, 40%);">-enum mgcp_codecs chan_mode_to_mgcp_codec(enum gsm48_chan_mode chan_mode, bool full_rate)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- switch (chan_mode) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM48_CMODE_SPEECH_V1:</span><br><span style="color: hsl(0, 100%, 40%);">- if (full_rate)</span><br><span style="color: hsl(0, 100%, 40%);">- return CODEC_GSM_8000_1;</span><br><span style="color: hsl(0, 100%, 40%);">- return CODEC_GSMHR_8000_1;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM48_CMODE_SPEECH_EFR:</span><br><span style="color: hsl(0, 100%, 40%);">- return CODEC_GSMEFR_8000_1;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM48_CMODE_SPEECH_AMR:</span><br><span style="color: hsl(0, 100%, 40%);">- return CODEC_AMR_8000_1;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-int chan_mode_to_mgcp_bss_pt(enum mgcp_codecs codec)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- switch (codec) {</span><br><span style="color: hsl(0, 100%, 40%);">- case CODEC_GSMHR_8000_1:</span><br><span style="color: hsl(0, 100%, 40%);">- return RTP_PT_GSM_HALF;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- case CODEC_GSMEFR_8000_1:</span><br><span style="color: hsl(0, 100%, 40%);">- return RTP_PT_GSM_EFR;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- case CODEC_AMR_8000_1:</span><br><span style="color: hsl(0, 100%, 40%);">- return RTP_PT_AMR;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- /* Not an error, we just leave it to libosmo-mgcp-client to</span><br><span style="color: hsl(0, 100%, 40%);">- * decide over the PT. */</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void mgcp_pick_codec(struct mgcp_conn_peer *verb_info, const struct gsm_lchan *lchan, bool bss_side)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- enum mgcp_codecs codec = chan_mode_to_mgcp_codec(lchan->tch_mode,</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->type == GSM_LCHAN_TCH_H? false : true);</span><br><span style="color: hsl(0, 100%, 40%);">- int custom_pt;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (codec < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_LCHAN(lchan, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "Unable to determine MGCP codec type for %s in chan-mode %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_lchant_name(lchan->type), gsm48_chan_mode_name(lchan->tch_mode));</span><br><span style="color: hsl(0, 100%, 40%);">- verb_info->codecs_len = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- verb_info->codecs[0] = codec;</span><br><span style="color: hsl(0, 100%, 40%);">- verb_info->codecs_len = 1;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Setup custom payload types (only for BSS side and when required) */</span><br><span style="color: hsl(0, 100%, 40%);">- custom_pt = chan_mode_to_mgcp_bss_pt(codec);</span><br><span style="color: hsl(0, 100%, 40%);">- if (bss_side && custom_pt > 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- verb_info->ptmap[0].codec = codec;</span><br><span style="color: hsl(0, 100%, 40%);">- verb_info->ptmap[0].pt = custom_pt;</span><br><span style="color: hsl(0, 100%, 40%);">- verb_info->ptmap_len = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* AMR requires additional parameters to be set up (framing mode) */</span><br><span style="color: hsl(0, 100%, 40%);">- if (verb_info->codecs[0] == CODEC_AMR_8000_1) {</span><br><span style="color: hsl(0, 100%, 40%);">- verb_info->param_present = true;</span><br><span style="color: hsl(0, 100%, 40%);">- verb_info->param.amr_octet_aligned_present = true;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (bss_side && verb_info->codecs[0] == CODEC_AMR_8000_1) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: At the moment all BTSs we support are using the</span><br><span style="color: hsl(0, 100%, 40%);">- * octet-aligned payload format. However, in the future</span><br><span style="color: hsl(0, 100%, 40%);">- * we may support BTSs that are using bandwith-efficient</span><br><span style="color: hsl(0, 100%, 40%);">- * format. In this case we will have to add functionality</span><br><span style="color: hsl(0, 100%, 40%);">- * that distinguishes by the BTS model which mode to use. */</span><br><span style="color: hsl(0, 100%, 40%);">- verb_info->param.amr_octet_aligned = true;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- else if (!bss_side && verb_info->codecs[0] == CODEC_AMR_8000_1) {</span><br><span style="color: hsl(0, 100%, 40%);">- verb_info->param.amr_octet_aligned = lchan->conn->sccp.msc->amr_octet_aligned;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span>diff --git a/src/osmo-bsc/net_init.c b/src/osmo-bsc/net_init.c</span><br><span>index c2a38bc..1ef9bd5 100644</span><br><span>--- a/src/osmo-bsc/net_init.c</span><br><span>+++ b/src/osmo-bsc/net_init.c</span><br><span>@@ -51,6 +51,12 @@</span><br><span> {}</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_tdef g_mgw_tdefs[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { .T=-1, .default_val=4, .desc="MGCP response timeout" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .T=-2, .default_val=30, .desc="RTP stream establishing timeout" },</span><br><span style="color: hsl(120, 100%, 40%);">+ {}</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Initialize the bare minimum of struct gsm_network, minimizing required dependencies.</span><br><span> * This part is shared among the thin programs in osmo-bsc/src/utils/.</span><br><span> * osmo-bsc requires further initialization that pulls in more dependencies (see bsc_network_init()). */</span><br><span>@@ -81,5 +87,8 @@</span><br><span> net->T_defs = gsm_network_T_defs;</span><br><span> osmo_tdefs_reset(net->T_defs);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ net->mgw.tdefs = g_mgw_tdefs;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_tdefs_reset(net->mgw.tdefs);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return net;</span><br><span> }</span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c</span><br><span>index 65618fd..2d5d4ae 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_bssap.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_bssap.c</span><br><span>@@ -19,7 +19,8 @@</span><br><span> *</span><br><span> */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/mgcp_client/mgcp_client_fsm.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/sockaddr_str.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/mgcp_client/mgcp_client_endpoint_fsm.h></span><br><span> </span><br><span> #include <osmocom/bsc/osmo_bsc.h></span><br><span> #include <osmocom/bsc/osmo_bsc_grace.h></span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_lcls.c b/src/osmo-bsc/osmo_bsc_lcls.c</span><br><span>index 98c74c7..a01c02e 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_lcls.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_lcls.c</span><br><span>@@ -29,8 +29,8 @@</span><br><span> #include <osmocom/bsc/bsc_subscr_conn_fsm.h></span><br><span> #include <osmocom/bsc/gsm_data.h></span><br><span> #include <osmocom/bsc/osmo_bsc_lcls.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/bsc/mgw_endpoint_fsm.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/mgcp_client/mgcp_client_fsm.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/lchan_rtp_fsm.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/mgcp_client/mgcp_client_endpoint_fsm.h></span><br><span> </span><br><span> struct value_string lcls_event_names[] = {</span><br><span> { LCLS_EV_UPDATE_CFG_CSC, "UPDATE_CFG_CSC" },</span><br><span>@@ -277,7 +277,7 @@</span><br><span> {</span><br><span> mgcp_pick_codec(mdcx_info, conn->lchan, false);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- mgw_endpoint_ci_request(conn->user_plane.mgw_endpoint_ci_msc, MGCP_VERB_MDCX, mdcx_info,</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mgcpc_ep_ci_request(conn->user_plane.mgw_endpoint_ci_msc, MGCP_VERB_MDCX, mdcx_info,</span><br><span> NULL, 0, 0, NULL);</span><br><span> }</span><br><span> </span><br><span>@@ -647,7 +647,7 @@</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- other_mgw_info = mgwep_ci_get_rtp_info(conn_other->user_plane.mgw_endpoint_ci_msc);</span><br><span style="color: hsl(120, 100%, 40%);">+ other_mgw_info = osmo_mgcpc_ep_ci_get_rtp_info(conn_other->user_plane.mgw_endpoint_ci_msc);</span><br><span> if (!other_mgw_info) {</span><br><span> LOGPFSML(fi, LOGL_ERROR, "Cannot enable LCLS without RTP port info of MSC-side"</span><br><span> " -- missing CRCX?\n");</span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c</span><br><span>index 08bb40d..0e0e8ca 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_main.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_main.c</span><br><span>@@ -33,7 +33,6 @@</span><br><span> #include <osmocom/bsc/handover_decision_2.h></span><br><span> #include <osmocom/bsc/timeslot_fsm.h></span><br><span> #include <osmocom/bsc/lchan_fsm.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/bsc/mgw_endpoint_fsm.h></span><br><span> #include <osmocom/bsc/bsc_subscr_conn_fsm.h></span><br><span> #include <osmocom/bsc/bsc_subscriber.h></span><br><span> #include <osmocom/bsc/assignment_fsm.h></span><br><span>@@ -54,6 +53,8 @@</span><br><span> #include <osmocom/vty/logging.h></span><br><span> #include <osmocom/vty/command.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/mgcp_client/mgcp_client_endpoint_fsm.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #include <osmocom/abis/abis.h></span><br><span> #include <osmocom/bsc/abis_om2000.h></span><br><span> #include <osmocom/bsc/abis_nm.h></span><br><span>@@ -849,7 +850,6 @@</span><br><span> lchan_fsm_init();</span><br><span> bsc_subscr_conn_fsm_init();</span><br><span> assignment_fsm_init();</span><br><span style="color: hsl(0, 100%, 40%);">- mgw_endpoint_fsm_init(bsc_gsmnet->T_defs);</span><br><span> handover_fsm_init();</span><br><span> </span><br><span> /* Read the config */</span><br><span>diff --git a/tests/handover/Makefile.am b/tests/handover/Makefile.am</span><br><span>index 40ecf54..56aea50 100644</span><br><span>--- a/tests/handover/Makefile.am</span><br><span>+++ b/tests/handover/Makefile.am</span><br><span>@@ -34,7 +34,7 @@</span><br><span> </span><br><span> handover_test_LDFLAGS = \</span><br><span> -Wl,--wrap=abis_rsl_sendmsg \</span><br><span style="color: hsl(0, 100%, 40%);">- -Wl,--wrap=mgw_endpoint_ci_request \</span><br><span style="color: hsl(120, 100%, 40%);">+ -Wl,--wrap=osmo_mgcpc_ep_ci_request \</span><br><span> $(NULL)</span><br><span> </span><br><span> handover_test_LDADD = \</span><br><span>@@ -64,7 +64,6 @@</span><br><span> $(top_builddir)/src/osmo-bsc/lchan_rtp_fsm.o \</span><br><span> $(top_builddir)/src/osmo-bsc/lchan_select.o \</span><br><span> $(top_builddir)/src/osmo-bsc/meas_rep.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/osmo-bsc/mgw_endpoint_fsm.o \</span><br><span> $(top_builddir)/src/osmo-bsc/neighbor_ident.o \</span><br><span> $(top_builddir)/src/osmo-bsc/net_init.o \</span><br><span> $(top_builddir)/src/osmo-bsc/osmo_bsc_lcls.o \</span><br><span>diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c</span><br><span>index cd3b749..a8a77be 100644</span><br><span>--- a/tests/handover/handover_test.c</span><br><span>+++ b/tests/handover/handover_test.c</span><br><span>@@ -27,7 +27,7 @@</span><br><span> #include <osmocom/core/select.h></span><br><span> #include <osmocom/core/talloc.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/mgcp_client/mgcp_client_fsm.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/mgcp_client/mgcp_client_endpoint_fsm.h></span><br><span> </span><br><span> #include <osmocom/bsc/abis_rsl.h></span><br><span> #include <osmocom/bsc/debug.h></span><br><span>@@ -45,7 +45,6 @@</span><br><span> #include <osmocom/bsc/bsc_subscr_conn_fsm.h></span><br><span> #include <osmocom/bsc/timeslot_fsm.h></span><br><span> #include <osmocom/bsc/lchan_fsm.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/bsc/mgw_endpoint_fsm.h></span><br><span> #include <osmocom/bsc/handover_fsm.h></span><br><span> #include <osmocom/bsc/bsc_msc_data.h></span><br><span> </span><br><span>@@ -53,14 +52,14 @@</span><br><span> </span><br><span> struct gsm_network *bsc_gsmnet;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* override, requires '-Wl,--wrap=mgw_endpoint_ci_request'.</span><br><span style="color: hsl(120, 100%, 40%);">+/* override, requires '-Wl,--wrap=osmo_mgcpc_ep_ci_request'.</span><br><span> * Catch modification of an MGCP connection. */</span><br><span style="color: hsl(0, 100%, 40%);">-void __real_mgw_endpoint_ci_request(struct mgwep_ci *ci,</span><br><span style="color: hsl(120, 100%, 40%);">+void __real_osmo_mgcpc_ep_ci_request(struct osmo_mgcpc_ep_ci *ci,</span><br><span> enum mgcp_verb verb, const struct mgcp_conn_peer *verb_info,</span><br><span> struct osmo_fsm_inst *notify,</span><br><span> uint32_t event_success, uint32_t event_failure,</span><br><span> void *notify_data);</span><br><span style="color: hsl(0, 100%, 40%);">-void __wrap_mgw_endpoint_ci_request(struct mgwep_ci *ci,</span><br><span style="color: hsl(120, 100%, 40%);">+void __wrap_osmo_mgcpc_ep_ci_request(struct osmo_mgcpc_ep_ci *ci,</span><br><span> enum mgcp_verb verb, const struct mgcp_conn_peer *verb_info,</span><br><span> struct osmo_fsm_inst *notify,</span><br><span> uint32_t event_success, uint32_t event_failure,</span><br><span>@@ -234,9 +233,11 @@</span><br><span> </span><br><span> conn = bsc_subscr_con_allocate(net);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- conn->user_plane.mgw_endpoint = mgw_endpoint_alloc(conn->fi,</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->user_plane.mgw_endpoint = osmo_mgcpc_ep_alloc(conn->fi,</span><br><span> GSCON_EV_FORGET_MGW_ENDPOINT,</span><br><span style="color: hsl(0, 100%, 40%);">- fake_mgcp_client, "test",</span><br><span style="color: hsl(120, 100%, 40%);">+ fake_mgcp_client,</span><br><span style="color: hsl(120, 100%, 40%);">+ net->mgw.tdefs,</span><br><span style="color: hsl(120, 100%, 40%);">+ "test",</span><br><span> "fake endpoint");</span><br><span> conn->sccp.msc = &fake_msc_data;</span><br><span> </span><br><span>@@ -1432,7 +1433,6 @@</span><br><span> </span><br><span> ts_fsm_init();</span><br><span> lchan_fsm_init();</span><br><span style="color: hsl(0, 100%, 40%);">- mgw_endpoint_fsm_init(bsc_gsmnet->T_defs);</span><br><span> bsc_subscr_conn_fsm_init();</span><br><span> handover_fsm_init();</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13796">change 13796</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/13796"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I03e6b48d9b0a5370310d5f56809259ff7909cf9d </div>
<div style="display:none"> Gerrit-Change-Number: 13796 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>