diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2018-12-11 18:59:27 +0100 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2018-12-11 19:52:30 +0100 |
| commit | 85cb2538f4cb4c6759824dae546564562ff3888e (patch) | |
| tree | 516c398bd422758921cba66f847183f753df2640 /include | |
| parent | 36dedeeb12f733c4f569e3d05ba25537dee66d99 (diff) | |
Revert "move ASS-COMPL MGCP handling out of a_iface_bssap.c"
Two reasons:
- the caller of msc_mgcp_ass_complete() from Iu, iucs_rx_rab_assign(), failed
to be adjusted, breaking IuCS, as an --enable-iu --enable-werror build shows.
Unfortunately our gerrit verification doesn't --enable-werror for osmo-msc.
- the condition of requiring ST_MDCX_RAN is faulty, breaking GSM CS.
This reverts commit 212c0c9bdaf1166e3bcbab85f3ab31dc17162f5b.
Change-Id: I8348675c2f7c8856ea1682d05ee54160d4cfeb96
Diffstat (limited to 'include')
| -rw-r--r-- | include/osmocom/msc/msc_mgcp.h | 5 | ||||
| -rw-r--r-- | include/osmocom/msc/ran_conn.h | 5 |
2 files changed, 1 insertions, 9 deletions
diff --git a/include/osmocom/msc/msc_mgcp.h b/include/osmocom/msc/msc_mgcp.h index db8dff24c..9d8b01dd1 100644 --- a/include/osmocom/msc/msc_mgcp.h +++ b/include/osmocom/msc/msc_mgcp.h @@ -24,8 +24,6 @@ #include <osmocom/msc/gsm_data.h> struct ran_conn; -struct gsm0808_speech_codec; -struct sockaddr_storage; /* MGCP state handler context. This context information stores all information * to handle the direction of the RTP streams via MGCP. There is one instance @@ -60,7 +58,6 @@ struct mgcp_ctx { }; int msc_mgcp_call_assignment(struct gsm_trans *trans); -int msc_mgcp_ass_complete(struct ran_conn *conn, const struct gsm0808_speech_codec *speech_codec_chosen, - const struct sockaddr_storage *aoip_transport_addr); +int msc_mgcp_ass_complete(struct ran_conn *conn, uint16_t port, char *addr); int msc_mgcp_call_complete(struct gsm_trans *trans, uint16_t port, char *addr); int msc_mgcp_call_release(struct gsm_trans *trans); diff --git a/include/osmocom/msc/ran_conn.h b/include/osmocom/msc/ran_conn.h index 3716f865d..d71872e8e 100644 --- a/include/osmocom/msc/ran_conn.h +++ b/include/osmocom/msc/ran_conn.h @@ -7,9 +7,6 @@ #include <osmocom/sigtran/sccp_sap.h> #include <osmocom/mgcp_client/mgcp_client.h> -struct gsm0808_speech_codec; -struct sockaddr_storage; - enum ran_type { RAN_UNKNOWN, RAN_GERAN_A, /* 2G / A-interface */ @@ -200,8 +197,6 @@ void ran_conn_rx_sec_mode_compl(struct ran_conn *conn); void ran_conn_classmark_chg(struct ran_conn *conn, const uint8_t *cm2, uint8_t cm2_len, const uint8_t *cm3, uint8_t cm3_len); -void ran_conn_assign_compl(struct ran_conn *conn, const struct gsm0808_speech_codec *speech_codec_chosen, - const struct sockaddr_storage *aoip_transport_addr); void ran_conn_assign_fail(struct ran_conn *conn, uint8_t cause, uint8_t *rr_cause); void ran_conn_init(void); |