diff options
author | Harald Welte <laforge@gnumonks.org> | 2017-12-17 21:48:47 +0100 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2017-12-19 17:53:13 +0000 |
commit | d9956d91ba1504deae248b3e1978de5e584f275f (patch) | |
tree | 70264d70b10c321b1faba6e6749c587555b4ab98 /src/libbsc/abis_rsl.c | |
parent | f8dc5262070585e9c1b0166cc8b17fc6ada208a1 (diff) |
Remove dead code left over from NITB split
There still is a lot of dead code that we inherited from the NITB
days, let's remove more of it.
libtrau will be re-introduced as part of osmo-mgw later.
Change-Id: I8e0af56a158f25a4f1384d667c03eb20e72df5b8
Diffstat (limited to 'src/libbsc/abis_rsl.c')
-rw-r--r-- | src/libbsc/abis_rsl.c | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/src/libbsc/abis_rsl.c b/src/libbsc/abis_rsl.c index ef7a6fbd5..980b3e662 100644 --- a/src/libbsc/abis_rsl.c +++ b/src/libbsc/abis_rsl.c @@ -40,8 +40,6 @@ #include <osmocom/bsc/paging.h> #include <osmocom/bsc/signal.h> #include <osmocom/bsc/meas_rep.h> -#include <osmocom/bsc/rtp_proxy.h> -#include <osmocom/bsc/gsm_subscriber.h> #include <osmocom/abis/e1_input.h> #include <osmocom/gsm/rsl.h> #include <osmocom/core/talloc.h> @@ -51,6 +49,11 @@ #define RSL_ALLOC_SIZE 1024 #define RSL_ALLOC_HEADROOM 128 +#define RTP_PT_GSM_FULL 3 +#define RTP_PT_GSM_HALF 96 +#define RTP_PT_GSM_EFR 97 +#define RTP_PT_AMR 98 + enum sacch_deact { SACCH_NONE, SACCH_DEACTIVATE, @@ -160,9 +163,6 @@ static struct gsm_lchan *lchan_lookup(struct gsm_bts_trx *trx, uint8_t chan_nr, LOGP(DRSL, LOGL_ERROR, "%s %smismatching chan_nr=0x%02x\n", gsm_ts_and_pchan_name(lchan->ts), log_name, chan_nr); - if (lchan->conn) - log_set_context(LOG_CTX_VLR_SUBSCR, lchan->conn->vsub); - return lchan; } @@ -2422,20 +2422,6 @@ int rsl_ipacc_mdcx(struct gsm_lchan *lchan, uint32_t ip, uint16_t port, return abis_rsl_sendmsg(msg); } -/* tell BTS to connect RTP stream to our local RTP socket */ -int rsl_ipacc_mdcx_to_rtpsock(struct gsm_lchan *lchan) -{ - struct rtp_socket *rs = lchan->abis_ip.rtp_socket; - int rc; - - rc = rsl_ipacc_mdcx(lchan, ntohl(rs->rtp.sin_local.sin_addr.s_addr), - ntohs(rs->rtp.sin_local.sin_port), - /* FIXME: use RTP payload of bound socket, not BTS*/ - lchan->abis_ip.rtp_payload2); - - return rc; -} - int rsl_ipacc_pdch_activate(struct gsm_bts_trx_ts *ts, int act) { struct msgb *msg = rsl_msgb_alloc(); |