Review at https://gerrit.osmocom.org/5475
Remove dead code
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
---
M configure.ac
M include/osmocom/bsc/Makefile.am
D include/osmocom/bsc/auth.h
M include/osmocom/bsc/bss.h
M include/osmocom/bsc/chan_alloc.h
M include/osmocom/bsc/common_bsc.h
M include/osmocom/bsc/common_cs.h
D include/osmocom/bsc/crc24.h
M include/osmocom/bsc/gsm_data.h
M include/osmocom/bsc/gsm_data_shared.h
D include/osmocom/bsc/gsm_subscriber.h
M include/osmocom/bsc/ipaccess.h
D include/osmocom/bsc/mncc.h
D include/osmocom/bsc/mncc_int.h
D include/osmocom/bsc/msc_ifaces.h
D include/osmocom/bsc/rtp_proxy.h
M include/osmocom/bsc/signal.h
D include/osmocom/bsc/silent_call.h
D include/osmocom/bsc/smpp.h
D include/osmocom/bsc/sms_queue.h
D include/osmocom/bsc/transaction.h
D include/osmocom/bsc/trau_mux.h
D include/osmocom/bsc/trau_upqueue.h
M src/Makefile.am
M src/ipaccess/Makefile.am
M src/ipaccess/ipaccess-config.c
M src/libbsc/abis_rsl.c
M src/libbsc/bsc_api.c
M src/libbsc/bsc_init.c
M src/libbsc/chan_alloc.c
M src/libbsc/e1_config.c
M src/libbsc/gsm_04_08_utils.c
M src/libbsc/handover_logic.c
M src/libbsc/net_init.c
M src/libcommon-cs/common_cs.c
M src/libcommon-cs/common_cs_vty.c
M src/libcommon/Makefile.am
M src/libcommon/common_vty.c
D src/libcommon/gsm_subscriber_base.c
M src/libcommon/talloc_ctx.c
D src/libtrau/Makefile.am
D src/libtrau/rtp_proxy.c
D src/libtrau/trau_mux.c
D src/libtrau/trau_upqueue.c
M src/osmo-bsc/Makefile.am
M src/osmo-bsc/osmo_bsc_filter.c
M src/osmo-bsc/osmo_bsc_main.c
M src/osmo-bsc_nat/Makefile.am
M src/osmo-bsc_nat/bsc_filter.c
M src/utils/Makefile.am
M src/utils/bs11_config.c
M tests/Makefile.am
M tests/abis/Makefile.am
M tests/bsc-nat-trie/Makefile.am
M tests/bsc-nat/Makefile.am
M tests/bsc/Makefile.am
M tests/bsc/bsc_test.c
M tests/bssap/Makefile.am
M tests/bssap/bssap_test.c
M tests/channel/channel_test.c
M tests/gsm0408/Makefile.am
M tests/gsm0408/gsm0408_test.c
M tests/nanobts_omlattr/Makefile.am
M tests/subscr/Makefile.am
M tests/testsuite.at
D tests/trau/Makefile.am
D tests/trau/trau_test.c
D tests/trau/trau_test.ok
68 files changed, 30 insertions(+), 2,490 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/75/5475/1
diff --git a/configure.ac b/configure.ac
index b7dd016..540d2cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -145,7 +145,6 @@
include/osmocom/Makefile
include/osmocom/bsc/Makefile
src/Makefile
- src/libtrau/Makefile
src/libbsc/Makefile
src/libcommon/Makefile
src/libfilter/Makefile
@@ -161,7 +160,6 @@
tests/bsc-nat/Makefile
tests/bsc-nat-trie/Makefile
tests/abis/Makefile
- tests/trau/Makefile
tests/subscr/Makefile
tests/nanobts_omlattr/Makefile
tests/bssap/Makefile
diff --git a/include/osmocom/bsc/Makefile.am b/include/osmocom/bsc/Makefile.am
index 9d2ee6e..4dc6639 100644
--- a/include/osmocom/bsc/Makefile.am
+++ b/include/osmocom/bsc/Makefile.am
@@ -4,21 +4,18 @@
abis_om2000.h \
abis_rsl.h \
arfcn_range_encode.h \
- auth.h \
bsc_msc.h \
bsc_msg_filter.h \
bsc_nat.h \
bsc_nat_callstats.h \
bsc_nat_sccp.h \
bsc_rll.h \
- bsc_subscriber.h \
bss.h \
bts_ipaccess_nanobts_omlattr.h \
chan_alloc.h \
common.h \
common_bsc.h \
common_cs.h \
- crc24.h \
ctrl.h \
debug.h \
e1_config.h \
@@ -26,16 +23,12 @@
gsm_04_80.h \
gsm_data.h \
gsm_data_shared.h \
- gsm_subscriber.h \
handover.h \
handover_decision.h \
ipaccess.h \
meas_feed.h \
meas_rep.h \
misdn.h \
- mncc.h \
- mncc_int.h \
- msc_ifaces.h \
nat_rewrite_trie.h \
network_listen.h \
openbscdefines.h \
@@ -52,15 +45,9 @@
rest_octets.h \
rrlp.h \
rs232.h \
- rtp_proxy.h \
signal.h \
- silent_call.h \
- sms_queue.h \
socket.h \
system_information.h \
- transaction.h \
- trau_mux.h \
- trau_upqueue.h \
ussd.h \
vty.h \
bsc_api.h \
diff --git a/include/osmocom/bsc/auth.h b/include/osmocom/bsc/auth.h
deleted file mode 100644
index b314bbf..0000000
--- a/include/osmocom/bsc/auth.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef _AUTH_H
-#define _AUTH_H
-
-#include <osmocom/core/utils.h>
-
-struct gsm_auth_tuple;
-
-enum auth_action {
- AUTH_ERROR = -1, /* Internal error */
- AUTH_NOT_AVAIL = 0, /* No auth tuple available */
- AUTH_DO_AUTH_THEN_CIPH = 1, /* Firsth authenticate, then cipher */
- AUTH_DO_CIPH = 2, /* Only ciphering */
- AUTH_DO_AUTH = 3, /* Only authentication, no ciphering */
-};
-
-extern const struct value_string auth_action_names[];
-static inline const char *auth_action_str(enum auth_action a)
-{
- return get_value_string(auth_action_names, a);
-}
-
-#endif /* _AUTH_H */
diff --git a/include/osmocom/bsc/bss.h b/include/osmocom/bsc/bss.h
index b12487d..9891f5f 100644
--- a/include/osmocom/bsc/bss.h
+++ b/include/osmocom/bsc/bss.h
@@ -6,7 +6,7 @@
struct msgb;
/* start and stop network */
-extern int bsc_network_alloc(mncc_recv_cb_t mncc_recv);
+extern int bsc_network_alloc(void);
extern int bsc_network_configure(const char *cfg_file);
extern int bsc_shutdown_net(struct gsm_network *net);
diff --git a/include/osmocom/bsc/chan_alloc.h b/include/osmocom/bsc/chan_alloc.h
index 320fa94..62d0286 100644
--- a/include/osmocom/bsc/chan_alloc.h
+++ b/include/osmocom/bsc/chan_alloc.h
@@ -24,9 +24,6 @@
struct gsm_subscriber_connection;
-/* Find an allocated channel for a specified subscriber */
-struct gsm_subscriber_connection *connection_for_subscr(struct vlr_subscr
*vsub);
-
/* Allocate a logical channel (SDCCH, TCH, ...) */
struct gsm_lchan *lchan_alloc(struct gsm_bts *bts, enum gsm_chan_t type, int
allow_bigger);
diff --git a/include/osmocom/bsc/common_bsc.h b/include/osmocom/bsc/common_bsc.h
index 08394e9..32e5097 100644
--- a/include/osmocom/bsc/common_bsc.h
+++ b/include/osmocom/bsc/common_bsc.h
@@ -5,5 +5,4 @@
struct gsm_network *bsc_network_init(void *ctx,
uint16_t country_code,
- uint16_t network_code,
- mncc_recv_cb_t mncc_recv);
+ uint16_t network_code);
diff --git a/include/osmocom/bsc/common_cs.h b/include/osmocom/bsc/common_cs.h
index 09a4b02..c2e8515 100644
--- a/include/osmocom/bsc/common_cs.h
+++ b/include/osmocom/bsc/common_cs.h
@@ -6,8 +6,6 @@
struct msgb;
struct gsm_network;
-typedef int (*mncc_recv_cb_t)(struct gsm_network *, struct msgb *);
-
struct vty;
#define MAX_A5_KEY_LEN (128/8)
@@ -20,8 +18,7 @@
struct gsm_network *gsm_network_init(void *ctx,
uint16_t country_code,
- uint16_t network_code,
- mncc_recv_cb_t mncc_recv);
+ uint16_t network_code);
int common_cs_vty_init(struct gsm_network *network,
int (* config_write_net )(struct vty *));
diff --git a/include/osmocom/bsc/crc24.h b/include/osmocom/bsc/crc24.h
deleted file mode 100644
index 756638c..0000000
--- a/include/osmocom/bsc/crc24.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _CRC24_H
-#define _CRC24_H
-
-#include <stdint.h>
-
-#define INIT_CRC24 0xffffff
-
-uint32_t crc24_calc(uint32_t fcs, uint8_t *cp, unsigned int len);
-
-#endif
diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h
index cbb809b..3268426 100644
--- a/include/osmocom/bsc/gsm_data.h
+++ b/include/osmocom/bsc/gsm_data.h
@@ -24,11 +24,9 @@
#define OBSC_NM_W_ACK_CB(__msgb) (__msgb)->cb[3]
-struct mncc_sock_state;
struct gsm_subscriber_group;
struct bsc_subscr;
struct vlr_instance;
-struct vlr_subscr;
struct gprs_ra_id;
#define OBSC_LINKID_CB(__msgb) (__msgb)->cb[3]
@@ -107,34 +105,8 @@
/* global linked list of subscriber_connections */
struct llist_head entry;
- /* usage count. If this drops to zero, we start the release
- * towards A/Iu */
- uint32_t use_count;
-
- /* The MS has opened the conn with a CM Service Request, and we shall
- * keep it open for an actual request (or until timeout). */
- bool received_cm_service_request;
-
/* libbsc subscriber information (if available) */
struct bsc_subscr *bsub;
-
- /* libmsc/libvlr subscriber information (if available) */
- struct vlr_subscr *vsub;
-
- /* LU expiration handling */
- uint8_t expire_timer_stopped;
- /* SMS helpers for libmsc */
- uint8_t next_rp_ref;
-
- struct osmo_fsm_inst *conn_fsm;
-
- /* Are we part of a special "silent" call */
- int silent_call;
-
- /* MNCC rtp bridge markers */
- int mncc_rtp_bridge;
- int mncc_rtp_create_pending;
- int mncc_rtp_connect_pending;
/* bsc structures */
struct osmo_bsc_sccp_con *sccp_con; /* BSC */
@@ -142,7 +114,6 @@
/* back pointers */
struct gsm_network *network;
- bool in_release;
struct gsm_lchan *lchan; /* BSC */
struct gsm_lchan *ho_lchan; /* BSC */
struct gsm_bts *bts; /* BSC */
@@ -150,9 +121,6 @@
/* for assignment handling */
struct osmo_timer_list T10; /* BSC */
struct gsm_lchan *secondary_lchan; /* BSC */
-
- /* connected via 2G or 3G? */
- enum ran_type via_ran;
struct gsm_classmark classmark;
@@ -336,10 +304,6 @@
struct rate_ctr_group *bsc_ctrs;
struct osmo_counter *active_calls;
- /* layer 4 */
- struct mncc_sock_state *mncc_state;
- mncc_recv_cb_t mncc_recv;
- struct llist_head upqueue;
/*
* TODO: Move the trans_list into the subscriber connection and
* create a pending list for MT transactions. These exist before
@@ -380,8 +344,6 @@
/* MSC data in case we are a true BSC */
struct osmo_bsc_data *bsc_data;
-
- struct gsm_sms_queue *sms_queue;
/* control interface */
struct ctrl_handle *ctrl;
@@ -451,7 +413,6 @@
struct gsm_sms {
unsigned long long id;
- struct vlr_subscr *receiver;
struct gsm_sms_addr src, dst;
enum gsm_sms_source_id source;
diff --git a/include/osmocom/bsc/gsm_data_shared.h
b/include/osmocom/bsc/gsm_data_shared.h
index e762c24..9bbcabd 100644
--- a/include/osmocom/bsc/gsm_data_shared.h
+++ b/include/osmocom/bsc/gsm_data_shared.h
@@ -33,7 +33,6 @@
struct osmo_bsc_data;
struct osmo_bsc_sccp_con;
-struct gsm_sms_queue;
/* RRLP mode of operation */
enum rrlp_mode {
diff --git a/include/osmocom/bsc/gsm_subscriber.h
b/include/osmocom/bsc/gsm_subscriber.h
deleted file mode 100644
index ca66d47..0000000
--- a/include/osmocom/bsc/gsm_subscriber.h
+++ /dev/null
@@ -1,68 +0,0 @@
-#ifndef _GSM_SUBSCR_H
-#define _GSM_SUBSCR_H
-
-#include <stdbool.h>
-
-#include <osmocom/core/linuxlist.h>
-#include <osmocom/gsm/protocol/gsm_23_003.h>
-
-#include <osmocom/bsc/gsm_data.h>
-
-#define GSM_NAME_LENGTH 160
-
-#define GSM_EXTENSION_LENGTH 15 /* MSISDN can only be 15 digits length */
-#define GSM_MIN_EXTEN 20000
-#define GSM_MAX_EXTEN 49999
-
-#define GSM_SUBSCRIBER_FIRST_CONTACT 0x00000001
-/* gprs_sgsn.h defines additional flags including and above bit 16 (0x10000) */
-
-#define GSM_SUBSCRIBER_NO_EXPIRATION 0x0
-
-enum gsm_subscriber_field {
- GSM_SUBSCRIBER_IMSI,
- GSM_SUBSCRIBER_TMSI,
- GSM_SUBSCRIBER_EXTENSION,
- GSM_SUBSCRIBER_ID,
-};
-
-enum gsm_subscriber_update_reason {
- GSM_SUBSCRIBER_UPDATE_ATTACHED,
- GSM_SUBSCRIBER_UPDATE_DETACHED,
- GSM_SUBSCRIBER_UPDATE_EQUIPMENT,
-};
-
-/*
- * Struct for pending channel requests. This is managed in the
- * llist_head requests of each subscriber. The reference counting
- * should work in such a way that a subscriber with a pending request
- * remains in memory.
- */
-struct subscr_request {
- struct llist_head entry;
-
- /* human readable label to be able to log pending request kinds */
- const char *label;
-
- /* the callback data */
- gsm_cbfn *cbfn;
- void *param;
-};
-
-int subscr_update(struct vlr_subscr *vsub, int reason);
-
-/*
- * Paging handling with authentication
- */
-struct subscr_request *subscr_request_conn(struct vlr_subscr *vsub,
- gsm_cbfn *cbfn, void *param,
- const char *label);
-
-void subscr_remove_request(struct subscr_request *req);
-int subscr_rx_paging_response(struct msgb *msg,
- struct gsm_subscriber_connection *conn);
-
-int subscr_paging_dispatch(unsigned int hooknum, unsigned int event,
- struct msgb *msg, void *data, void *param);
-
-#endif /* _GSM_SUBSCR_H */
diff --git a/include/osmocom/bsc/ipaccess.h b/include/osmocom/bsc/ipaccess.h
index 82e89c2..3d0f612 100644
--- a/include/osmocom/bsc/ipaccess.h
+++ b/include/osmocom/bsc/ipaccess.h
@@ -2,11 +2,13 @@
#define _IPACCESS_H
#include <osmocom/abis/e1_input.h>
-#include "gsm_subscriber.h"
#include <osmocom/core/linuxlist.h>
#include <osmocom/gsm/protocol/ipaccess.h>
#include <osmocom/gsm/protocol/gsm_23_003.h>
+struct gsm_bts;
+struct gsm_bts_trx;
+
struct ipac_msgt_sccp_state {
uint8_t src_ref[3];
uint8_t dst_ref[3];
diff --git a/include/osmocom/bsc/mncc.h b/include/osmocom/bsc/mncc.h
deleted file mode 100644
index 881e041..0000000
--- a/include/osmocom/bsc/mncc.h
+++ /dev/null
@@ -1,215 +0,0 @@
-/* GSM Mobile Radio Interface Layer 3 messages on the A-bis interface
- * 3GPP TS 04.08 version 7.21.0 Release 1998 / ETSI TS 100 940 V7.21.0 */
-
-/* (C) 2008-2009 by Harald Welte <[email protected]>
- * (C) 2008, 2009 by Holger Hans Peter Freyther <[email protected]>
- *
- * All Rights Reserved
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef _MNCC_H
-#define _MNCC_H
-
-#include <osmocom/core/linuxlist.h>
-#include <osmocom/gsm/mncc.h>
-
-#include <stdint.h>
-
-struct gsm_network;
-struct msgb;
-
-
-/* One end of a call */
-struct gsm_call {
- struct llist_head entry;
-
- /* network handle */
- void *net;
-
- /* the 'local' transaction */
- uint32_t callref;
- /* the 'remote' transaction */
- uint32_t remote_ref;
-};
-
-#define MNCC_SETUP_REQ 0x0101
-#define MNCC_SETUP_IND 0x0102
-#define MNCC_SETUP_RSP 0x0103
-#define MNCC_SETUP_CNF 0x0104
-#define MNCC_SETUP_COMPL_REQ 0x0105
-#define MNCC_SETUP_COMPL_IND 0x0106
-/* MNCC_REJ_* is perfomed via MNCC_REL_* */
-#define MNCC_CALL_CONF_IND 0x0107
-#define MNCC_CALL_PROC_REQ 0x0108
-#define MNCC_PROGRESS_REQ 0x0109
-#define MNCC_ALERT_REQ 0x010a
-#define MNCC_ALERT_IND 0x010b
-#define MNCC_NOTIFY_REQ 0x010c
-#define MNCC_NOTIFY_IND 0x010d
-#define MNCC_DISC_REQ 0x010e
-#define MNCC_DISC_IND 0x010f
-#define MNCC_REL_REQ 0x0110
-#define MNCC_REL_IND 0x0111
-#define MNCC_REL_CNF 0x0112
-#define MNCC_FACILITY_REQ 0x0113
-#define MNCC_FACILITY_IND 0x0114
-#define MNCC_START_DTMF_IND 0x0115
-#define MNCC_START_DTMF_RSP 0x0116
-#define MNCC_START_DTMF_REJ 0x0117
-#define MNCC_STOP_DTMF_IND 0x0118
-#define MNCC_STOP_DTMF_RSP 0x0119
-#define MNCC_MODIFY_REQ 0x011a
-#define MNCC_MODIFY_IND 0x011b
-#define MNCC_MODIFY_RSP 0x011c
-#define MNCC_MODIFY_CNF 0x011d
-#define MNCC_MODIFY_REJ 0x011e
-#define MNCC_HOLD_IND 0x011f
-#define MNCC_HOLD_CNF 0x0120
-#define MNCC_HOLD_REJ 0x0121
-#define MNCC_RETRIEVE_IND 0x0122
-#define MNCC_RETRIEVE_CNF 0x0123
-#define MNCC_RETRIEVE_REJ 0x0124
-#define MNCC_USERINFO_REQ 0x0125
-#define MNCC_USERINFO_IND 0x0126
-#define MNCC_REJ_REQ 0x0127
-#define MNCC_REJ_IND 0x0128
-
-#define MNCC_BRIDGE 0x0200
-#define MNCC_FRAME_RECV 0x0201
-#define MNCC_FRAME_DROP 0x0202
-#define MNCC_LCHAN_MODIFY 0x0203
-#define MNCC_RTP_CREATE 0x0204
-#define MNCC_RTP_CONNECT 0x0205
-#define MNCC_RTP_FREE 0x0206
-
-#define GSM_TCHF_FRAME 0x0300
-#define GSM_TCHF_FRAME_EFR 0x0301
-#define GSM_TCHH_FRAME 0x0302
-#define GSM_TCH_FRAME_AMR 0x0303
-#define GSM_BAD_FRAME 0x03ff
-
-#define MNCC_SOCKET_HELLO 0x0400
-
-#define GSM_MAX_FACILITY 128
-#define GSM_MAX_SSVERSION 128
-#define GSM_MAX_USERUSER 128
-
-#define MNCC_F_BEARER_CAP 0x0001
-#define MNCC_F_CALLED 0x0002
-#define MNCC_F_CALLING 0x0004
-#define MNCC_F_REDIRECTING 0x0008
-#define MNCC_F_CONNECTED 0x0010
-#define MNCC_F_CAUSE 0x0020
-#define MNCC_F_USERUSER 0x0040
-#define MNCC_F_PROGRESS 0x0080
-#define MNCC_F_EMERGENCY 0x0100
-#define MNCC_F_FACILITY 0x0200
-#define MNCC_F_SSVERSION 0x0400
-#define MNCC_F_CCCAP 0x0800
-#define MNCC_F_KEYPAD 0x1000
-#define MNCC_F_SIGNAL 0x2000
-
-struct gsm_mncc {
- /* context based information */
- uint32_t msg_type;
- uint32_t callref;
-
- /* which fields are present */
- uint32_t fields;
-
- /* data derived informations (MNCC_F_ based) */
- struct gsm_mncc_bearer_cap bearer_cap;
- struct gsm_mncc_number called;
- struct gsm_mncc_number calling;
- struct gsm_mncc_number redirecting;
- struct gsm_mncc_number connected;
- struct gsm_mncc_cause cause;
- struct gsm_mncc_progress progress;
- struct gsm_mncc_useruser useruser;
- struct gsm_mncc_facility facility;
- struct gsm_mncc_cccap cccap;
- struct gsm_mncc_ssversion ssversion;
- struct {
- int sup;
- int inv;
- } clir;
- int signal;
-
- /* data derived information, not MNCC_F based */
- int keypad;
- int more;
- int notify; /* 0..127 */
- int emergency;
- char imsi[16];
-};
-
-struct gsm_data_frame {
- uint32_t msg_type;
- uint32_t callref;
- unsigned char data[0];
-};
-
-#define MNCC_SOCK_VERSION 5
-struct gsm_mncc_hello {
- uint32_t msg_type;
- uint32_t version;
-
- /* send the sizes of the structs */
- uint32_t mncc_size;
- uint32_t data_frame_size;
-
- /* send some offsets */
- uint32_t called_offset;
- uint32_t signal_offset;
- uint32_t emergency_offset;
-};
-
-struct gsm_mncc_rtp {
- uint32_t msg_type;
- uint32_t callref;
- uint32_t ip;
- uint16_t port;
- uint32_t payload_type;
- uint32_t payload_msg_type;
-};
-
-struct gsm_mncc_bridge {
- uint32_t msg_type;
- uint32_t callref[2];
-};
-
-const char *get_mncc_name(int value);
-void mncc_set_cause(struct gsm_mncc *data, int loc, int val);
-void cc_tx_to_mncc(struct gsm_network *net, struct msgb *msg);
-
-/* input from CC code into mncc_builtin */
-int int_mncc_recv(struct gsm_network *net, struct msgb *msg);
-
-/* input from CC code into mncc_sock */
-int mncc_sock_from_cc(struct gsm_network *net, struct msgb *msg);
-
-int mncc_sock_init(struct gsm_network *net, const char *sock_path);
-
-#define mncc_is_data_frame(msg_type) \
- (msg_type == GSM_TCHF_FRAME \
- || msg_type == GSM_TCHF_FRAME_EFR \
- || msg_type == GSM_TCHH_FRAME \
- || msg_type == GSM_TCH_FRAME_AMR \
- || msg_type == GSM_BAD_FRAME)
-
-
-#endif
diff --git a/include/osmocom/bsc/mncc_int.h b/include/osmocom/bsc/mncc_int.h
deleted file mode 100644
index 213ce14..0000000
--- a/include/osmocom/bsc/mncc_int.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef _MNCC_INT_H
-#define _MNCC_INT_H
-
-#include <stdint.h>
-
-struct mncc_int {
- uint8_t def_codec[2];
-};
-
-extern struct mncc_int mncc_int;
-
-uint8_t mncc_codec_for_mode(int lchan_type);
-
-#endif
diff --git a/include/osmocom/bsc/msc_ifaces.h b/include/osmocom/bsc/msc_ifaces.h
deleted file mode 100644
index dadb828..0000000
--- a/include/osmocom/bsc/msc_ifaces.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#pragma once
-
-#include <osmocom/core/msgb.h>
-#include <osmocom/bsc/gsm_data.h>
-
-/* These are the interfaces of the MSC layer towards (from?) the BSC and RNC,
- * i.e. in the direction towards the mobile device (MS aka UE).
- *
- * 2G will use the A-interface,
- * 3G aka UMTS will use the Iu-interface (for the MSC, it's IuCS).
- *
- * To allow linking parts of the MSC code without having to include entire
- * infrastructures of external libraries, the core transmitting and receiving
- * functions are left unimplemented. For example, a unit test does not need to
- * link against external ASN1 libraries if it is never going to encode actual
- * outgoing messages. It is up to each building scope to implement real world
- * functions or to plug mere dummy implementations.
- *
- * For example, msc_tx_dtap(conn, msg), depending on conn->via_iface, will call
- * either iu_tx() or a_tx() [note: at time of writing, the A-interface is not
- * yet implemented]. When you try to link against libmsc, you will find that
- * the compiler complains about an undefined reference to iu_tx(). If you,
- * however, link against libiu as well as the osmo-iuh libs (etc.), iu_tx() is
- * available. A unit test may instead simply implement a dummy iu_tx() function
- * and not link against osmo-iuh, see tests/libiudummy/.
- */
-
-/* Each main linkage must implement this function (see comment above). */
-extern int iu_tx(struct msgb *msg, uint8_t sapi);
-
-int msc_tx_dtap(struct gsm_subscriber_connection *conn,
- struct msgb *msg);
-
-int msc_gsm48_tx_mm_serv_ack(struct gsm_subscriber_connection *conn);
-int msc_gsm48_tx_mm_serv_rej(struct gsm_subscriber_connection *conn,
- enum gsm48_reject_value value);
-
-int msc_tx_common_id(struct gsm_subscriber_connection *conn);
-int msc_call_assignment(struct gsm_trans *trans);
-int msc_call_bridge(struct gsm_trans *trans1, struct gsm_trans *trans2);
-void msc_call_release(struct gsm_trans *trans);
-int msc_call_connect(struct gsm_trans *trans, uint16_t port, uint32_t ip);
diff --git a/include/osmocom/bsc/rtp_proxy.h b/include/osmocom/bsc/rtp_proxy.h
deleted file mode 100644
index 918420c..0000000
--- a/include/osmocom/bsc/rtp_proxy.h
+++ /dev/null
@@ -1,95 +0,0 @@
-#ifndef _RTP_PROXY_H
-#define _RTP_PROXY_H
-
-/* RTP proxy handling for ip.access nanoBTS */
-
-/* (C) 2009 by Harald Welte <[email protected]>
- * All Rights Reserved
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-
-#include <netinet/in.h>
-
-#include <osmocom/core/linuxlist.h>
-#include <osmocom/core/select.h>
-
-#include <osmocom/bsc/mncc.h>
-
-#define RTP_PT_GSM_FULL 3
-#define RTP_PT_GSM_HALF 96
-#define RTP_PT_GSM_EFR 97
-#define RTP_PT_AMR 98
-#define RTP_LEN_GSM_FULL 33
-#define RTP_LEN_GSM_HALF 15
-#define RTP_LEN_GSM_EFR 31
-#define RTP_GSM_DURATION 160
-
-enum rtp_rx_action {
- RTP_NONE,
- RTP_PROXY,
- RTP_RECV_UPSTREAM,
-};
-
-enum rtp_tx_action {
- RTP_SEND_NONE,
- RTP_SEND_DOWNSTREAM,
-};
-
-struct rtp_sub_socket {
- struct sockaddr_in sin_local;
- struct sockaddr_in sin_remote;
-
- struct osmo_fd bfd;
- /* linked list of to-be-transmitted msgb's */
- struct llist_head tx_queue;
-};
-
-struct rtp_socket {
- struct llist_head list;
-
- struct rtp_sub_socket rtp;
- struct rtp_sub_socket rtcp;
-
- /* what should we do on receive? */
- enum rtp_rx_action rx_action;
- union {
- struct {
- struct rtp_socket *other_sock;
- } proxy;
- struct {
- struct gsm_network *net;
- uint32_t callref;
- } receive;
- };
- enum rtp_tx_action tx_action;
- struct {
- uint16_t sequence;
- uint32_t timestamp;
- uint32_t ssrc;
- struct timeval last_tv;
- } transmit;
-};
-
-struct rtp_socket *rtp_socket_create(void);
-int rtp_socket_bind(struct rtp_socket *rs, uint32_t ip);
-int rtp_socket_connect(struct rtp_socket *rs, uint32_t ip, uint16_t port);
-int rtp_socket_proxy(struct rtp_socket *this, struct rtp_socket *other);
-int rtp_socket_upstream(struct rtp_socket *this, struct gsm_network *net,
uint32_t callref);
-int rtp_socket_free(struct rtp_socket *rs);
-int rtp_send_frame(struct rtp_socket *rs, struct gsm_data_frame *frame);
-
-#endif /* _RTP_PROXY_H */
diff --git a/include/osmocom/bsc/signal.h b/include/osmocom/bsc/signal.h
index feab246..58d9acf 100644
--- a/include/osmocom/bsc/signal.h
+++ b/include/osmocom/bsc/signal.h
@@ -34,34 +34,21 @@
*/
enum signal_subsystems {
SS_PAGING,
- SS_SMS,
SS_ABISIP,
SS_NM,
SS_LCHAN,
- SS_SUBSCR,
- SS_SCALL,
SS_CHALLOC,
SS_IPAC_NWL,
SS_RF,
SS_MSC,
SS_HO,
SS_CCCH,
- SS_SGSN,
};
/* SS_PAGING signals */
enum signal_paging {
S_PAGING_SUCCEEDED,
S_PAGING_EXPIRED,
-};
-
-/* SS_SMS signals */
-enum signal_sms {
- S_SMS_SUBMITTED, /* A SMS has been successfully submitted to us
*/
- S_SMS_DELIVERED, /* A SMS has been successfully delivered to a
MS */
- S_SMS_SMMA, /* A MS tells us it has more space available */
- S_SMS_MEM_EXCEEDED, /* A MS tells us it has no more space available
*/
- S_SMS_UNKNOWN_ERROR, /* A MS tells us it has an error */
};
/* SS_ABISIP signals */
@@ -108,20 +95,6 @@
S_CHALLOC_FREED, /* lchan has been successfully freed */
};
-/* SS_SUBSCR signals */
-enum signal_subscr {
- S_SUBSCR_ATTACHED,
- S_SUBSCR_DETACHED,
- S_SUBSCR_IDENTITY, /* we've received some identity
information */
-};
-
-/* SS_SCALL signals */
-enum signal_scall {
- S_SCALL_SUCCESS,
- S_SCALL_EXPIRED,
- S_SCALL_DETACHED,
-};
-
/* SS_IPAC_NWL signals */
enum signal_ipaccess {
S_IPAC_NWL_COMPLETE,
@@ -136,21 +109,6 @@
S_RF_OFF,
S_RF_ON,
S_RF_GRACE,
-};
-
-struct paging_signal_data {
- struct vlr_subscr *vsub;
- struct gsm_bts *bts;
-
- int paging_result;
-
- /* NULL in case the paging didn't work */
- struct gsm_subscriber_connection *conn;
-};
-
-struct scall_signal_data {
- struct gsm_subscriber_connection *conn;
- void *data;
};
struct ipacc_ack_signal_data {
@@ -197,15 +155,6 @@
struct gsm_network *net;
};
-struct sms_signal_data {
- /* The transaction where this occured */
- struct gsm_trans *trans;
- /* Can be NULL for SMMA */
- struct gsm_sms *sms;
- /* int paging result. Only the ones with > 0 */
- int paging_result;
-};
-
struct lchan_signal_data {
/* The lchan the signal happened on */
struct gsm_lchan *lchan;
@@ -237,24 +186,6 @@
uint16_t rach_slot_count;
uint16_t rach_busy_count;
uint16_t rach_access_count;
-};
-
-/* GPRS SGSN signals SS_SGSN */
-enum signal_sgsn {
- S_SGSN_ATTACH,
- S_SGSN_DETACH,
- S_SGSN_UPDATE,
- S_SGSN_PDP_ACT,
- S_SGSN_PDP_DEACT,
- S_SGSN_PDP_TERMINATE,
- S_SGSN_PDP_FREE,
- S_SGSN_MM_FREE,
-};
-
-struct sgsn_mm_ctx;
-struct sgsn_signal_data {
- struct sgsn_mm_ctx *mm;
- struct sgsn_pdp_ctx *pdp; /* non-NULL for PDP_ACT, PDP_DEACT,
PDP_FREE */
};
#endif
diff --git a/include/osmocom/bsc/silent_call.h
b/include/osmocom/bsc/silent_call.h
deleted file mode 100644
index 5fec77b..0000000
--- a/include/osmocom/bsc/silent_call.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef _SILENT_CALL_H
-#define _SILENT_CALL_H
-
-struct gsm_subscriber_connection;
-
-extern int gsm_silent_call_start(struct vlr_subscr *vsub,
- void *data, int type);
-extern int gsm_silent_call_stop(struct vlr_subscr *vsub);
-
-#if 0
-extern int silent_call_rx(struct gsm_subscriber_connection *conn, struct msgb
*msg);
-extern int silent_call_reroute(struct gsm_subscriber_connection *conn, struct
msgb *msg);
-#endif
-
-#endif /* _SILENT_CALL_H */
diff --git a/include/osmocom/bsc/smpp.h b/include/osmocom/bsc/smpp.h
deleted file mode 100644
index bcdac8f..0000000
--- a/include/osmocom/bsc/smpp.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-int smpp_openbsc_alloc_init(void *ctx);
-int smpp_openbsc_start(struct gsm_network *net);
diff --git a/include/osmocom/bsc/sms_queue.h b/include/osmocom/bsc/sms_queue.h
deleted file mode 100644
index 2a8bd58..0000000
--- a/include/osmocom/bsc/sms_queue.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef SMS_QUEUE_H
-#define SMS_QUEUE_H
-
-struct gsm_network;
-struct gsm_sms_queue;
-struct vty;
-
-int sms_queue_start(struct gsm_network *, int in_flight);
-int sms_queue_trigger(struct gsm_sms_queue *);
-
-/* vty helper functions */
-int sms_queue_stats(struct gsm_sms_queue *, struct vty* vty);
-int sms_queue_set_max_pending(struct gsm_sms_queue *, int max);
-int sms_queue_set_max_failure(struct gsm_sms_queue *, int fail);
-int sms_queue_clear(struct gsm_sms_queue *);
-
-#endif
diff --git a/include/osmocom/bsc/transaction.h
b/include/osmocom/bsc/transaction.h
deleted file mode 100644
index 5465548..0000000
--- a/include/osmocom/bsc/transaction.h
+++ /dev/null
@@ -1,102 +0,0 @@
-#ifndef _TRANSACT_H
-#define _TRANSACT_H
-
-#include <osmocom/bsc/gsm_data.h>
-#include <osmocom/bsc/gsm_subscriber.h>
-#include <osmocom/core/linuxlist.h>
-#include <osmocom/bsc/mncc.h>
-#include <osmocom/gsm/gsm0411_smc.h>
-#include <osmocom/gsm/gsm0411_smr.h>
-
-enum bridge_state {
- BRIDGE_STATE_NONE,
- BRIDGE_STATE_LOOPBACK_PENDING,
- BRIDGE_STATE_LOOPBACK_ESTABLISHED,
- BRIDGE_STATE_BRIDGE_PENDING,
- BRIDGE_STATE_BRIDGE_ESTABLISHED,
-};
-
-/* One transaction */
-struct gsm_trans {
- /* Entry in list of all transactions */
- struct llist_head entry;
-
- /* Back pointer to the network struct */
- struct gsm_network *net;
-
- /* The protocol within which we live */
- uint8_t protocol;
-
- /* The current transaction ID */
- uint8_t transaction_id;
-
- /* To whom we belong, unique identifier of remote MM entity */
- struct vlr_subscr *vsub;
-
- /* The associated connection we are using to transmit messages */
- struct gsm_subscriber_connection *conn;
-
- /* reference from MNCC or other application */
- uint32_t callref;
-
- /* if traffic channel receive was requested */
- int tch_recv;
-
- /* is thats one paging? */
- struct subscr_request *paging_request;
-
- /* bearer capabilities (rate and codec) */
- struct gsm_mncc_bearer_cap bearer_cap;
-
- /* status of the assignment, true when done */
- bool assignment_done;
-
- /* if true, TCH_RTP_CREATE is sent after the
- * assignment is done */
- bool tch_rtp_create;
-
- union {
- struct {
-
- /* current call state */
- int state;
-
- /* current timer and message queue */
- int Tcurrent; /* current CC timer */
- int T308_second; /* used to send release again */
- struct osmo_timer_list timer;
- struct gsm_mncc msg; /* stores
setup/disconnect/release message */
- } cc;
- struct {
- struct gsm411_smc_inst smc_inst;
- struct gsm411_smr_inst smr_inst;
-
- struct gsm_sms *sms;
- } sms;
- };
-
- struct {
- struct gsm_trans *peer;
- enum bridge_state state;
- } bridge;
-};
-
-
-
-struct gsm_trans *trans_find_by_id(struct gsm_subscriber_connection *conn,
- uint8_t proto, uint8_t trans_id);
-struct gsm_trans *trans_find_by_callref(struct gsm_network *net,
- uint32_t callref);
-
-struct gsm_trans *trans_alloc(struct gsm_network *net,
- struct vlr_subscr *vsub,
- uint8_t protocol, uint8_t trans_id,
- uint32_t callref);
-void trans_free(struct gsm_trans *trans);
-
-int trans_assign_trans_id(struct gsm_network *net, struct vlr_subscr *vsub,
- uint8_t protocol, uint8_t ti_flag);
-struct gsm_trans *trans_has_conn(const struct gsm_subscriber_connection *conn);
-void trans_conn_closed(struct gsm_subscriber_connection *conn);
-
-#endif
diff --git a/include/osmocom/bsc/trau_mux.h b/include/osmocom/bsc/trau_mux.h
deleted file mode 100644
index eeceff5..0000000
--- a/include/osmocom/bsc/trau_mux.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Simple TRAU frame reflector to route voice calls */
-
-/* (C) 2009 by Harald Welte <[email protected]>
- * All Rights Reserved
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-/* The "TRAU mux map" defines which particular 16kbit sub-slot (in which E1
- * timeslot on which E1 interface) should be directly muxed to which other
- * sub-slot. Entries in the mux map are always bi-directional.
- *
- * The idea of all this is to directly switch voice channels in the BSC
- * from one phone to another. We do this right now since we don't support
- * any external interface for voice channels, and in the future as an
- * optimization to routing them externally.
- */
-
-#include <stdint.h>
-#include <osmocom/bsc/gsm_data.h>
-#include <osmocom/bsc/mncc.h>
-
-struct decoded_trau_frame;
-
-/* map a TRAU mux map entry */
-int trau_mux_map(const struct gsm_e1_subslot *src,
- const struct gsm_e1_subslot *dst);
-int trau_mux_map_lchan(const struct gsm_lchan *src,
- const struct gsm_lchan *dst);
-
-/* unmap a TRAU mux map entry */
-int trau_mux_unmap(const struct gsm_e1_subslot *ss, uint32_t callref);
-
-/* we get called by subchan_demux */
-int trau_mux_input(struct gsm_e1_subslot *src_e1_ss,
- const uint8_t *trau_bits, int num_bits);
-
-/* add a trau receiver */
-int trau_recv_lchan(struct gsm_lchan *lchan, uint32_t callref);
-
-/* send trau from application */
-int trau_send_frame(struct gsm_lchan *lchan, struct gsm_data_frame *frame);
-
-/* switch trau muxer to new lchan */
-int switch_trau_mux(struct gsm_lchan *old_lchan, struct gsm_lchan *new_lchan);
-
-/* callback invoked if we receive TRAU frames */
-int subch_cb(struct subch_demux *dmx, int ch, uint8_t *data, int len, void
*_priv);
-
-/* TRAU frame transcoding */
-struct msgb *trau_decode_fr(uint32_t callref,
- const struct decoded_trau_frame *tf);
-struct msgb *trau_decode_efr(uint32_t callref,
- const struct decoded_trau_frame *tf);
-void trau_encode_fr(struct decoded_trau_frame *tf,
- const unsigned char *data);
-void trau_encode_efr(struct decoded_trau_frame *tf,
- const unsigned char *data);
diff --git a/include/osmocom/bsc/trau_upqueue.h
b/include/osmocom/bsc/trau_upqueue.h
deleted file mode 100644
index ecc7658..0000000
--- a/include/osmocom/bsc/trau_upqueue.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _TRAU_UPQUEUE_H
-#define _TRAU_UPQUEUE_H
-
-void trau_tx_to_mncc(struct gsm_network *net, struct msgb *msg);
-
-#endif /* _TRAU_UPQUEUE_H */
-
diff --git a/src/Makefile.am b/src/Makefile.am
index 454bf26..637272d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,7 +24,6 @@
libcommon \
libcommon-cs \
libbsc \
- libtrau \
libfilter \
$(NULL)
diff --git a/src/ipaccess/Makefile.am b/src/ipaccess/Makefile.am
index 4dfe247..b3b2b8c 100644
--- a/src/ipaccess/Makefile.am
+++ b/src/ipaccess/Makefile.am
@@ -30,7 +30,6 @@
abisip_find_LDADD = \
$(top_builddir)/src/libbsc/libbsc.a \
- $(top_builddir)/src/libtrau/libtrau.a \
$(top_builddir)/src/libcommon/libcommon.a \
$(OSMO_LIBS) \
$(NULL)
@@ -49,7 +48,6 @@
ipaccess_config_LDADD = \
$(top_builddir)/src/libbsc/libbsc.a \
$(top_builddir)/src/libcommon-cs/libcommon-cs.a \
- $(top_builddir)/src/libtrau/libtrau.a \
$(top_builddir)/src/libcommon/libcommon.a \
$(OSMO_LIBS) \
$(NULL)
@@ -60,7 +58,6 @@
ipaccess_proxy_LDADD = \
$(top_builddir)/src/libbsc/libbsc.a \
- $(top_builddir)/src/libtrau/libtrau.a \
$(top_builddir)/src/libcommon/libcommon.a \
$(OSMO_LIBS) \
$(NULL)
diff --git a/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c
index c68e3ea..957a5bb 100644
--- a/src/ipaccess/ipaccess-config.c
+++ b/src/ipaccess/ipaccess-config.c
@@ -978,7 +978,7 @@
}
libosmo_abis_init(tall_ctx_config);
- bsc_gsmnet = bsc_network_init(tall_bsc_ctx, 1, 1, NULL);
+ bsc_gsmnet = bsc_network_init(tall_bsc_ctx, 1, 1);
if (!bsc_gsmnet)
exit(1);
diff --git a/src/libbsc/abis_rsl.c b/src/libbsc/abis_rsl.c
index ef7a6fb..980b3e6 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>
@@ -50,6 +48,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,
@@ -159,9 +162,6 @@
if (rc < 0)
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;
}
@@ -2420,20 +2420,6 @@
msg->dst = lchan->ts->trx->rsl_link;
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)
diff --git a/src/libbsc/bsc_api.c b/src/libbsc/bsc_api.c
index 845b1b7..6ff1688 100644
--- a/src/libbsc/bsc_api.c
+++ b/src/libbsc/bsc_api.c
@@ -24,13 +24,11 @@
#include <osmocom/bsc/bsc_api.h>
#include <osmocom/bsc/bsc_rll.h>
#include <osmocom/bsc/gsm_data.h>
-#include <osmocom/bsc/gsm_subscriber.h>
#include <osmocom/bsc/signal.h>
#include <osmocom/bsc/abis_rsl.h>
#include <osmocom/bsc/chan_alloc.h>
#include <osmocom/bsc/handover.h>
#include <osmocom/bsc/debug.h>
-#include <osmocom/bsc/trau_mux.h>
#include <osmocom/bsc/gsm_04_08_utils.h>
#include <osmocom/bsc/bsc_subscriber.h>
@@ -263,7 +261,6 @@
conn->network = net;
conn->lchan = lchan;
conn->bts = lchan->ts->trx->bts;
- conn->via_ran = RAN_GERAN_A;
conn->lac = conn->bts->location_area_code;
lchan->conn = conn;
llist_add_tail(&conn->entry, &net->subscr_conns);
@@ -277,11 +274,6 @@
if (conn->network->bsc_api->conn_cleanup)
conn->network->bsc_api->conn_cleanup(conn);
-
- if (conn->vsub) {
- LOGP(DNM, LOGL_ERROR, "conn->vsub should have been cleared.\n");
- conn->vsub = NULL;
- }
if (conn->ho_lchan) {
LOGP(DNM, LOGL_ERROR, "The ho_lchan should have been
cleared.\n");
@@ -452,10 +444,6 @@
msgb_l3len(msg) - sizeof(*gh));
return;
}
-
- /* switch TRAU muxer for E1 based BTS from one channel to another */
- if (is_e1_bts(conn->bts))
- switch_trau_mux(conn->lchan, conn->secondary_lchan);
/* swap channels */
osmo_timer_del(&conn->T10);
diff --git a/src/libbsc/bsc_init.c b/src/libbsc/bsc_init.c
index 2fb3842..34dfd36 100644
--- a/src/libbsc/bsc_init.c
+++ b/src/libbsc/bsc_init.c
@@ -529,10 +529,10 @@
return 0;
}
-int bsc_network_alloc(mncc_recv_cb_t mncc_recv)
+int bsc_network_alloc(void)
{
/* initialize our data structures */
- bsc_gsmnet = bsc_network_init(tall_bsc_ctx, 1, 1, mncc_recv);
+ bsc_gsmnet = bsc_network_init(tall_bsc_ctx, 1, 1);
if (!bsc_gsmnet)
return -ENOMEM;
diff --git a/src/libbsc/chan_alloc.c b/src/libbsc/chan_alloc.c
index 4b2531e..ad24a1e 100644
--- a/src/libbsc/chan_alloc.c
+++ b/src/libbsc/chan_alloc.c
@@ -25,12 +25,10 @@
#include <string.h>
#include <errno.h>
-#include <osmocom/bsc/gsm_subscriber.h>
#include <osmocom/bsc/chan_alloc.h>
#include <osmocom/bsc/abis_nm.h>
#include <osmocom/bsc/abis_rsl.h>
#include <osmocom/bsc/debug.h>
-#include <osmocom/bsc/rtp_proxy.h>
#include <osmocom/bsc/signal.h>
#include <osmocom/bsc/gsm_04_08_utils.h>
@@ -392,13 +390,6 @@
osmo_signal_dispatch(SS_LCHAN, S_LCHAN_UNEXPECTED_RELEASE,
&sig);
}
- if (lchan->abis_ip.rtp_socket) {
- LOGP(DRLL, LOGL_ERROR, "%s RTP Proxy Socket remained open.\n",
- gsm_lchan_name(lchan));
- rtp_socket_free(lchan->abis_ip.rtp_socket);
- lchan->abis_ip.rtp_socket = NULL;
- }
-
/* stop the timer */
osmo_timer_del(&lchan->T3101);
@@ -449,11 +440,6 @@
lchan->type = GSM_LCHAN_NONE;
rsl_lchan_set_state(lchan, LCHAN_S_NONE);
-
- if (lchan->abis_ip.rtp_socket) {
- rtp_socket_free(lchan->abis_ip.rtp_socket);
- lchan->abis_ip.rtp_socket = NULL;
- }
}
/* Drive the release process of the lchan */
diff --git a/src/libbsc/e1_config.c b/src/libbsc/e1_config.c
index 3656315..90e29d3 100644
--- a/src/libbsc/e1_config.c
+++ b/src/libbsc/e1_config.c
@@ -25,8 +25,6 @@
#include <osmocom/bsc/gsm_data.h>
#include <osmocom/abis/e1_input.h>
-#include <osmocom/abis/trau_frame.h>
-#include <osmocom/bsc/trau_mux.h>
#include <osmocom/bsc/misdn.h>
#include <osmocom/abis/ipaccess.h>
#include <osmocom/core/talloc.h>
@@ -45,7 +43,6 @@
{
struct gsm_e1_subslot *e1_link = &ts->e1_link;
struct e1inp_line *line;
- struct e1inp_ts *e1_ts;
DEBUGP(DLMI, "e1_reconfig_ts(%u,%u,%u)\n", ts->trx->bts->nr,
ts->trx->nr, ts->nr);
@@ -61,12 +58,6 @@
"non-existing E1 line %u\n", ts->nr, ts->trx->nr,
ts->trx->bts->nr, e1_link->e1_nr);
return -ENOMEM;
- }
-
- if (ts_is_tch(ts)) {
- e1_ts = &line->ts[e1_link->e1_ts-1];
- e1inp_ts_config_trau(e1_ts, line, subch_cb);
- subch_demux_activate(&e1_ts->trau.demux, e1_link->e1_ts_ss);
}
return 0;
diff --git a/src/libbsc/gsm_04_08_utils.c b/src/libbsc/gsm_04_08_utils.c
index 7fc696f..414fd6d 100644
--- a/src/libbsc/gsm_04_08_utils.c
+++ b/src/libbsc/gsm_04_08_utils.c
@@ -32,7 +32,6 @@
#include <osmocom/bsc/abis_rsl.h>
#include <osmocom/bsc/debug.h>
-#include <osmocom/bsc/transaction.h>
#include <osmocom/bsc/paging.h>
#include <osmocom/bsc/signal.h>
#include <osmocom/bsc/bsc_api.h>
diff --git a/src/libbsc/handover_logic.c b/src/libbsc/handover_logic.c
index 7b9dece..a30cd09 100644
--- a/src/libbsc/handover_logic.c
+++ b/src/libbsc/handover_logic.c
@@ -32,13 +32,10 @@
#include <osmocom/bsc/debug.h>
#include <osmocom/bsc/gsm_data.h>
#include <osmocom/gsm/gsm_utils.h>
-#include <osmocom/bsc/gsm_subscriber.h>
#include <osmocom/bsc/abis_rsl.h>
#include <osmocom/bsc/chan_alloc.h>
#include <osmocom/bsc/signal.h>
#include <osmocom/core/talloc.h>
-#include <osmocom/bsc/transaction.h>
-#include <osmocom/bsc/trau_mux.h>
#include <osmocom/bsc/bsc_subscriber.h>
#include <osmocom/bsc/gsm_04_08_utils.h>
@@ -270,10 +267,6 @@
rate_ctr_inc(&net->bsc_ctrs->ctr[BSC_CTR_HANDOVER_COMPLETED]);
osmo_timer_del(&ho->T3103);
-
- /* switch TRAU muxer for E1 based BTS from one channel to another */
- if (is_e1_bts(new_lchan->conn->bts))
- switch_trau_mux(ho->old_lchan, new_lchan);
/* Replace the ho lchan with the primary one */
if (ho->old_lchan != new_lchan->conn->lchan)
diff --git a/src/libbsc/net_init.c b/src/libbsc/net_init.c
index a71662c..59a8d5c 100644
--- a/src/libbsc/net_init.c
+++ b/src/libbsc/net_init.c
@@ -24,12 +24,11 @@
struct gsm_network *bsc_network_init(void *ctx,
uint16_t country_code,
- uint16_t network_code,
- mncc_recv_cb_t mncc_recv)
+ uint16_t network_code)
{
struct gsm_network *net;
- net = gsm_network_init(ctx, country_code, network_code, mncc_recv);
+ net = gsm_network_init(ctx, country_code, network_code);
net->bsc_data = talloc_zero(net, struct osmo_bsc_data);
if (!net->bsc_data) {
diff --git a/src/libcommon-cs/common_cs.c b/src/libcommon-cs/common_cs.c
index 2ac2612..b410b17 100644
--- a/src/libcommon-cs/common_cs.c
+++ b/src/libcommon-cs/common_cs.c
@@ -27,7 +27,6 @@
#include <osmocom/bsc/common_cs.h>
#include <osmocom/bsc/gsm_data.h>
-#include <osmocom/bsc/gsm_subscriber.h>
#include <osmocom/bsc/gsm_data.h>
#include <osmocom/bsc/gsm_04_08_utils.h>
@@ -39,8 +38,7 @@
*/
struct gsm_network *gsm_network_init(void *ctx,
uint16_t country_code,
- uint16_t network_code,
- mncc_recv_cb_t mncc_recv)
+ uint16_t network_code)
{
struct gsm_network *net;
@@ -55,15 +53,12 @@
net->t3212 = 5;
INIT_LLIST_HEAD(&net->trans_list);
- INIT_LLIST_HEAD(&net->upqueue);
INIT_LLIST_HEAD(&net->subscr_conns);
net->bsc_subscribers = talloc_zero(net, struct llist_head);
INIT_LLIST_HEAD(net->bsc_subscribers);
net->active_calls = osmo_counter_alloc("msc.active_calls");
-
- net->mncc_recv = mncc_recv;
net->dyn_ts_allow_tch_f = true;
@@ -127,17 +122,4 @@
uint8_t *classmark2_lv = (uint8_t *) &resp->classmark2;
return gsm48_extract_mi(classmark2_lv, length - classmark_offset,
mi_string, mi_type);
-}
-
-uint8_t sms_next_rp_msg_ref(uint8_t *next_rp_ref)
-{
- const uint8_t rp_msg_ref = *next_rp_ref;
- /*
- * This should wrap as the valid range is 0 to 255. We only
- * transfer one SMS at a time so we don't need to check if
- * the id has been already assigned.
- */
- *next_rp_ref += 1;
-
- return rp_msg_ref;
}
diff --git a/src/libcommon-cs/common_cs_vty.c b/src/libcommon-cs/common_cs_vty.c
index 74b1a93..beb936b 100644
--- a/src/libcommon-cs/common_cs_vty.c
+++ b/src/libcommon-cs/common_cs_vty.c
@@ -28,7 +28,6 @@
#include <osmocom/bsc/vty.h>
#include <osmocom/bsc/gsm_data.h>
-#include <osmocom/bsc/gsm_subscriber.h>
struct cmd_node net_node = {
GSMNET_NODE,
diff --git a/src/libcommon/Makefile.am b/src/libcommon/Makefile.am
index 6cfebc2..ec997b7 100644
--- a/src/libcommon/Makefile.am
+++ b/src/libcommon/Makefile.am
@@ -25,5 +25,4 @@
gsm_data_shared.c \
socket.c \
talloc_ctx.c \
- gsm_subscriber_base.c \
$(NULL)
diff --git a/src/libcommon/common_vty.c b/src/libcommon/common_vty.c
index d4d5fb5..82327d1 100644
--- a/src/libcommon/common_vty.c
+++ b/src/libcommon/common_vty.c
@@ -26,7 +26,6 @@
#include <osmocom/bsc/vty.h>
#include <osmocom/bsc/gsm_data.h>
#include <osmocom/bsc/debug.h>
-#include <osmocom/bsc/gsm_subscriber.h>
#include <osmocom/bsc/bsc_nat.h>
#include <osmocom/bsc/abis_om2000.h>
diff --git a/src/libcommon/gsm_subscriber_base.c
b/src/libcommon/gsm_subscriber_base.c
deleted file mode 100644
index a746c24..0000000
--- a/src/libcommon/gsm_subscriber_base.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* The concept of a subscriber as seen by the BSC */
-
-/* (C) 2008 by Harald Welte <[email protected]>
- * (C) 2009-2010 by Holger Hans Peter Freyther <[email protected]>
- * (C) 2010 by On-Waves
- *
- * All Rights Reserved
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-
-#include <osmocom/core/talloc.h>
-#include <osmocom/core/utils.h>
-#include <osmocom/bsc/gsm_subscriber.h>
-#include <osmocom/bsc/debug.h>
-
-LLIST_HEAD(active_subscribers);
-void *tall_subscr_ctx;
-
diff --git a/src/libcommon/talloc_ctx.c b/src/libcommon/talloc_ctx.c
index c8e9cd3..9f64d75 100644
--- a/src/libcommon/talloc_ctx.c
+++ b/src/libcommon/talloc_ctx.c
@@ -32,8 +32,6 @@
extern void *tall_sigh_ctx;
extern void *tall_tqe_ctx;
extern void *tall_trans_ctx;
-extern void *tall_map_ctx;
-extern void *tall_upq_ctx;
extern void *tall_ctr_ctx;
void talloc_ctx_init(void *ctx_root)
@@ -49,7 +47,5 @@
tall_sigh_ctx = talloc_named_const(ctx_root, 0, "signal_handler");
tall_tqe_ctx = talloc_named_const(ctx_root, 0, "subch_txq_entry");
tall_trans_ctx = talloc_named_const(ctx_root, 0, "transaction");
- tall_map_ctx = talloc_named_const(ctx_root, 0, "trau_map_entry");
- tall_upq_ctx = talloc_named_const(ctx_root, 0, "trau_upq_entry");
tall_ctr_ctx = talloc_named_const(ctx_root, 0, "counter");
}
diff --git a/src/libtrau/Makefile.am b/src/libtrau/Makefile.am
deleted file mode 100644
index 46becd6..0000000
--- a/src/libtrau/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-AM_CPPFLAGS = \
- $(all_includes) \
- -I$(top_srcdir)/include \
- -I$(top_builddir) \
- $(NULL)
-
-AM_CFLAGS = \
- -Wall \
- $(LIBOSMOCORE_CFLAGS) \
- $(LIBOSMOVTY_CFLAGS) \
- $(LIBOSMOABIS_CFLAGS) \
- $(LIBOSMONETIF_CFLAGS) \
- $(COVERAGE_CFLAGS) \
- $(NULL)
-
-AM_LDFLAGS = \
- $(LIBOSMOCORE_LIBS) \
- $(LIBOSMOGSM_LIBS) \
- $(LIBOSMOABIS_LIBS) \
- $(COVERAGE_LDFLAGS) \
- $(NULL)
-
-noinst_LIBRARIES = \
- libtrau.a \
- $(NULL)
-
-libtrau_a_SOURCES = \
- rtp_proxy.c \
- trau_mux.c \
- trau_upqueue.c \
- $(NULL)
diff --git a/src/libtrau/rtp_proxy.c b/src/libtrau/rtp_proxy.c
deleted file mode 100644
index 5b1ca79..0000000
--- a/src/libtrau/rtp_proxy.c
+++ /dev/null
@@ -1,764 +0,0 @@
-/* RTP proxy handling for ip.access nanoBTS */
-
-/* (C) 2009-2013 by Harald Welte <[email protected]>
- * All Rights Reserved
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <errno.h>
-#include <unistd.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <sys/time.h> /* gettimeofday() */
-#include <unistd.h> /* get..() */
-#include <time.h> /* clock() */
-#include <sys/utsname.h> /* uname() */
-
-#include <osmocom/core/talloc.h>
-#include <osmocom/core/utils.h>
-#include <osmocom/bsc/gsm_data.h>
-#include <osmocom/core/msgb.h>
-#include <osmocom/core/select.h>
-#include <osmocom/bsc/debug.h>
-#include <osmocom/bsc/rtp_proxy.h>
-#include <osmocom/bsc/mncc.h>
-#include <osmocom/bsc/trau_upqueue.h>
-
-#include <osmocom/netif/rtp.h>
-
-/* attempt to determine byte order */
-#include <sys/param.h>
-#include <limits.h>
-
-static LLIST_HEAD(rtp_sockets);
-
-/* should we mangle the CNAME inside SDES of RTCP packets? We disable
- * this by default, as it seems to be not needed */
-static int mangle_rtcp_cname = 0;
-
-enum rtp_bfd_priv {
- RTP_PRIV_NONE,
- RTP_PRIV_RTP,
- RTP_PRIV_RTCP
-};
-
-#define RTP_ALLOC_SIZE 1500
-
-#define RTCP_TYPE_SDES 202
-
-#define RTCP_IE_CNAME 1
-
-
-#define RTP_VERSION 2
-
-/* 33 for FR, all other codecs have smaller size */
-#define MAX_RTP_PAYLOAD_LEN 33
-
-/* decode an rtp frame and create a new buffer with payload */
-static int rtp_decode(struct msgb *msg, uint32_t callref, struct msgb **data)
-{
- struct msgb *new_msg;
- struct gsm_data_frame *frame;
- struct rtp_hdr *rtph = (struct rtp_hdr *)msg->data;
- struct rtp_x_hdr *rtpxh;
- uint8_t *payload, *payload_out;
- int payload_len;
- int msg_type;
- int x_len;
-
- if (msg->len < 12) {
- DEBUGPC(DLMUX, "received RTP frame too short (len = %d)\n",
- msg->len);
- return -EINVAL;
- }
- if (rtph->version != RTP_VERSION) {
- DEBUGPC(DLMUX, "received RTP version %d not supported.\n",
- rtph->version);
- return -EINVAL;
- }
- payload = msg->data + sizeof(struct rtp_hdr) + (rtph->csrc_count << 2);
- payload_len = msg->len - sizeof(struct rtp_hdr) - (rtph->csrc_count <<
2);
- if (payload_len < 0) {
- DEBUGPC(DLMUX, "received RTP frame too short (len = %d, "
- "csrc count = %d)\n", msg->len, rtph->csrc_count);
- return -EINVAL;
- }
- if (rtph->extension) {
- if (payload_len < sizeof(struct rtp_x_hdr)) {
- DEBUGPC(DLMUX, "received RTP frame too short for "
- "extension header\n");
- return -EINVAL;
- }
- rtpxh = (struct rtp_x_hdr *)payload;
- x_len = ntohs(rtpxh->length) * 4 + sizeof(struct rtp_x_hdr);
- payload += x_len;
- payload_len -= x_len;
- if (payload_len < 0) {
- DEBUGPC(DLMUX, "received RTP frame too short, "
- "extension header exceeds frame length\n");
- return -EINVAL;
- }
- }
- if (rtph->padding) {
- if (payload_len < 1) {
- DEBUGPC(DLMUX, "received RTP frame too short for "
- "padding length\n");
- return -EINVAL;
- }
- payload_len -= payload[payload_len - 1];
- if (payload_len < 0) {
- DEBUGPC(DLMUX, "received RTP frame with padding "
- "greater than payload\n");
- return -EINVAL;
- }
- }
-
- switch (rtph->payload_type) {
- case RTP_PT_GSM_FULL:
- msg_type = GSM_TCHF_FRAME;
- if (payload_len != RTP_LEN_GSM_FULL) {
- DEBUGPC(DLMUX, "received RTP full rate frame with "
- "payload length != %d (len = %d)\n",
- RTP_LEN_GSM_FULL, payload_len);
- return -EINVAL;
- }
- break;
- case RTP_PT_GSM_EFR:
- msg_type = GSM_TCHF_FRAME_EFR;
- if (payload_len != RTP_LEN_GSM_EFR) {
- DEBUGPC(DLMUX, "received RTP extended full rate frame "
- "with payload length != %d (len = %d)\n",
- RTP_LEN_GSM_EFR, payload_len);
- return -EINVAL;
- }
- break;
- case RTP_PT_GSM_HALF:
- msg_type = GSM_TCHH_FRAME;
- if (payload_len != RTP_LEN_GSM_HALF) {
- DEBUGPC(DLMUX, "received RTP half rate frame with "
- "payload length != %d (len = %d)\n",
- RTP_LEN_GSM_HALF, payload_len);
- return -EINVAL;
- }
- break;
- case RTP_PT_AMR:
- msg_type = GSM_TCH_FRAME_AMR;
- break;
- default:
- DEBUGPC(DLMUX, "received RTP frame with unknown payload "
- "type %d\n", rtph->payload_type);
- return -EINVAL;
- }
-
- if (payload_len > MAX_RTP_PAYLOAD_LEN ||
- (rtph->payload_type == RTP_PT_AMR &&
- payload_len > MAX_RTP_PAYLOAD_LEN - 1)) {
- DEBUGPC(DLMUX, "RTP payload too large (%d octets)\n",
- payload_len);
- return -EINVAL;
- }
-
- /* always allocate for the maximum possible size to avoid
- * fragmentation */
- new_msg = msgb_alloc(sizeof(struct gsm_data_frame) +
- MAX_RTP_PAYLOAD_LEN+1, "GSM-DATA (TCH)");
-
- if (!new_msg)
- return -ENOMEM;
- frame = (struct gsm_data_frame *) msgb_put(new_msg, sizeof(struct
gsm_data_frame));
- frame->msg_type = msg_type;
- frame->callref = callref;
- if (rtph->payload_type == RTP_PT_AMR) {
- /* for FR/HR/EFR the length is implicit. In AMR, we
- * need to make it explicit by using the first byte of
- * the data[] buffer as length byte */
- uint8_t *data0 = msgb_put(new_msg, 1);
- *data0 = payload_len;
- }
- payload_out = msgb_put(new_msg, payload_len);
- memcpy(payload_out, payload, payload_len);
-
- *data = new_msg;
- return 0;
-}
-
-/*! \brief encode and send a rtp frame
- * \param[in] rs RTP socket through which we shall send
- * \param[in] frame GSM RTP frame to be sent
- */
-int rtp_send_frame(struct rtp_socket *rs, struct gsm_data_frame *frame)
-{
- struct rtp_sub_socket *rss = &rs->rtp;
- struct msgb *msg;
- struct rtp_hdr *rtph;
- uint8_t *payload;
- int payload_type;
- int payload_len;
- int duration; /* in samples */
- int is_bfi = 0;
-
- if (rs->tx_action != RTP_SEND_DOWNSTREAM) {
- /* initialize sequences */
- rs->tx_action = RTP_SEND_DOWNSTREAM;
- rs->transmit.ssrc = rand();
- rs->transmit.sequence = random();
- rs->transmit.timestamp = random();
- }
-
- switch (frame->msg_type) {
- case GSM_TCHF_FRAME:
- payload_type = RTP_PT_GSM_FULL;
- payload_len = RTP_LEN_GSM_FULL;
- duration = RTP_GSM_DURATION;
- break;
- case GSM_TCHF_FRAME_EFR:
- payload_type = RTP_PT_GSM_EFR;
- payload_len = RTP_LEN_GSM_EFR;
- duration = RTP_GSM_DURATION;
- break;
- case GSM_TCHH_FRAME:
- payload_type = RTP_PT_GSM_HALF;
- payload_len = RTP_LEN_GSM_HALF;
- duration = RTP_GSM_DURATION;
- break;
- case GSM_TCH_FRAME_AMR:
- payload_type = RTP_PT_AMR;
- payload_len = frame->data[0];
- duration = RTP_GSM_DURATION;
- break;
- case GSM_BAD_FRAME:
- payload_type = 0;
- payload_len = 0;
- duration = RTP_GSM_DURATION;
- is_bfi = 1;
- break;
- default:
- DEBUGPC(DLMUX, "unsupported message type %d\n",
- frame->msg_type);
- return -EINVAL;
- }
-
- if (payload_len > MAX_RTP_PAYLOAD_LEN) {
- DEBUGPC(DLMUX, "RTP payload too large (%d octets)\n",
- payload_len);
- return -EINVAL;
- }
-
- if (is_bfi) {
- /* In case of a bad frame, just count and drop packet. */
- rs->transmit.timestamp += duration;
- rs->transmit.sequence++;
- return 0;
- }
-
- msg = msgb_alloc(sizeof(struct rtp_hdr) + payload_len, "RTP-GSM");
- if (!msg)
- return -ENOMEM;
- rtph = (struct rtp_hdr *) msgb_put(msg, sizeof(struct rtp_hdr));
- rtph->version = RTP_VERSION;
- rtph->padding = 0;
- rtph->extension = 0;
- rtph->csrc_count = 0;
- rtph->marker = 0;
- rtph->payload_type = payload_type;
- rtph->sequence = htons(rs->transmit.sequence++);
- rtph->timestamp = htonl(rs->transmit.timestamp);
- rs->transmit.timestamp += duration;
- rtph->ssrc = htonl(rs->transmit.ssrc);
-
- payload = msgb_put(msg, payload_len);
- if (frame->msg_type == GSM_TCH_FRAME_AMR)
- memcpy(payload, frame->data + 1, payload_len);
- else
- memcpy(payload, frame->data, payload_len);
- msgb_enqueue(&rss->tx_queue, msg);
- rss->bfd.when |= BSC_FD_WRITE;
-
- return 0;
-}
-
-/* iterate over all chunks in one RTCP message, look for CNAME IEs and
- * replace all of those with 'new_cname' */
-static int rtcp_sdes_cname_mangle(struct msgb *msg, struct rtcp_hdr *rh,
- uint16_t *rtcp_len, const char *new_cname)
-{
- uint8_t *rtcp_end;
- uint8_t *cur = (uint8_t *) rh;
- uint8_t tag, len = 0;
-
- rtcp_end = cur + *rtcp_len;
- /* move cur to end of RTP header */
- cur += sizeof(*rh);
-
- /* iterate over Chunks */
- while (cur+4 < rtcp_end) {
- /* skip four bytes SSRC/CSRC */
- cur += 4;
-
- /* iterate over IE's inside the chunk */
- while (cur+1 < rtcp_end) {
- tag = *cur++;
- if (tag == 0) {
- /* end of chunk, skip additional zero */
- while ((*cur++ == 0) && (cur < rtcp_end)) { }
- break;
- }
- len = *cur++;
-
- if (tag == RTCP_IE_CNAME) {
- /* we've found the CNAME, lets mangle it */
- if (len < strlen(new_cname)) {
- /* we need to make more space */
- int increase = strlen(new_cname) - len;
-
- msgb_push(msg, increase);
- memmove(cur+len+increase, cur+len,
- rtcp_end - (cur+len));
- /* FIXME: we have to respect RTCP
- * padding/alignment rules! */
- len += increase;
- *(cur-1) += increase;
- rtcp_end += increase;
- *rtcp_len += increase;
- }
- /* copy new CNAME into message */
- memcpy(cur, new_cname, strlen(new_cname));
- /* FIXME: zero the padding in case new CNAME
- * is smaller than old one !!! */
- }
- cur += len;
- }
- }
-
- return 0;
-}
-
-static int rtcp_mangle(struct msgb *msg, struct rtp_socket *rs)
-{
- struct rtp_sub_socket *rss = &rs->rtcp;
- struct rtcp_hdr *rtph;
- uint16_t old_len;
- int rc;
-
- if (!mangle_rtcp_cname)
- return 0;
-
- printf("RTCP\n");
- /* iterate over list of RTCP messages */
- rtph = (struct rtcp_hdr *)msg->data;
- while ((void *)rtph + sizeof(*rtph) <= (void *)msg->data + msg->len) {
- old_len = (ntohs(rtph->length) + 1) * 4;
- if ((void *)rtph + old_len > (void *)msg->data + msg->len) {
- DEBUGPC(DLMUX, "received RTCP packet too short for "
- "length element\n");
- return -EINVAL;
- }
- if (rtph->type == RTCP_TYPE_SDES) {
- char new_cname[255];
- osmo_strlcpy(new_cname,
- inet_ntoa(rss->sin_local.sin_addr),
- sizeof(new_cname));
- rc = rtcp_sdes_cname_mangle(msg, rtph, &old_len,
- new_cname);
- if (rc < 0)
- return rc;
- }
- rtph = (void *)rtph + old_len;
- }
-
- return 0;
-}
-
-/* read from incoming RTP/RTCP socket */
-static int rtp_socket_read(struct rtp_socket *rs, struct rtp_sub_socket *rss)
-{
- int rc;
- struct msgb *msg = msgb_alloc(RTP_ALLOC_SIZE, "RTP/RTCP");
- struct msgb *new_msg;
- struct rtp_sub_socket *other_rss;
-
- if (!msg)
- return -ENOMEM;
-
- rc = read(rss->bfd.fd, msg->data, RTP_ALLOC_SIZE);
- if (rc == 0) {
- rss->bfd.when &= ~BSC_FD_READ;
- goto out_free;
- } else if (rc < 0) {
- /* Ignore "connection refused". this happens, If we open the
- * socket faster than the remote side. */
- if (errno == ECONNREFUSED)
- goto out_free;
- DEBUGPC(DLMUX, "Read of RTP socket (%p) failed (errno %d, "
- "%s)\n", rs, errno, strerror(errno));
- rss->bfd.when &= ~BSC_FD_READ;
- goto out_free;
- }
-
- msgb_put(msg, rc);
-
- switch (rs->rx_action) {
- case RTP_PROXY:
- if (!rs->proxy.other_sock) {
- rc = -EIO;
- goto out_free;
- }
- if (rss->bfd.priv_nr == RTP_PRIV_RTP)
- other_rss = &rs->proxy.other_sock->rtp;
- else if (rss->bfd.priv_nr == RTP_PRIV_RTCP) {
- other_rss = &rs->proxy.other_sock->rtcp;
- /* modify RTCP SDES CNAME */
- rc = rtcp_mangle(msg, rs);
- if (rc < 0)
- goto out_free;
- } else {
- rc = -EINVAL;
- goto out_free;
- }
- msgb_enqueue(&other_rss->tx_queue, msg);
- other_rss->bfd.when |= BSC_FD_WRITE;
- break;
-
- case RTP_RECV_UPSTREAM:
- if (!rs->receive.callref || !rs->receive.net) {
- rc = -EIO;
- goto out_free;
- }
- if (rss->bfd.priv_nr == RTP_PRIV_RTCP) {
- if (!mangle_rtcp_cname) {
- msgb_free(msg);
- break;
- }
- /* modify RTCP SDES CNAME */
- rc = rtcp_mangle(msg, rs);
- if (rc < 0)
- goto out_free;
- msgb_enqueue(&rss->tx_queue, msg);
- rss->bfd.when |= BSC_FD_WRITE;
- break;
- }
- if (rss->bfd.priv_nr != RTP_PRIV_RTP) {
- rc = -EINVAL;
- goto out_free;
- }
- rc = rtp_decode(msg, rs->receive.callref, &new_msg);
- if (rc < 0)
- goto out_free;
- msgb_free(msg);
- trau_tx_to_mncc(rs->receive.net, new_msg);
- break;
-
- case RTP_NONE: /* if socket exists, but disabled by app */
- msgb_free(msg);
- break;
- }
-
- return 0;
-
-out_free:
- msgb_free(msg);
- return rc;
-}
-
-/* \brief write from tx_queue to RTP/RTCP socket */
-static int rtp_socket_write(struct rtp_socket *rs, struct rtp_sub_socket *rss)
-{
- struct msgb *msg;
- int written;
-
- msg = msgb_dequeue(&rss->tx_queue);
- if (!msg) {
- rss->bfd.when &= ~BSC_FD_WRITE;
- return 0;
- }
-
- written = write(rss->bfd.fd, msg->data, msg->len);
- if (written < msg->len) {
- LOGP(DLMIB, LOGL_ERROR, "short write");
- msgb_free(msg);
- return -EIO;
- }
-
- msgb_free(msg);
-
- return 0;
-}
-
-
-/*! \brief callback for the select.c:bfd_* layer */
-static int rtp_bfd_cb(struct osmo_fd *bfd, unsigned int flags)
-{
- struct rtp_socket *rs = bfd->data;
- struct rtp_sub_socket *rss;
-
- switch (bfd->priv_nr) {
- case RTP_PRIV_RTP:
- rss = &rs->rtp;
- break;
- case RTP_PRIV_RTCP:
- rss = &rs->rtcp;
- break;
- default:
- return -EINVAL;
- }
-
- if (flags & BSC_FD_READ)
- rtp_socket_read(rs, rss);
-
- if (flags & BSC_FD_WRITE)
- rtp_socket_write(rs, rss);
-
- return 0;
-}
-
-/*! \brief initialize one rtp sub-socket */
-static void init_rss(struct rtp_sub_socket *rss,
- struct rtp_socket *rs, int fd, int priv_nr)
-{
- /* initialize bfd */
- rss->bfd.fd = fd;
- rss->bfd.data = rs;
- rss->bfd.priv_nr = priv_nr;
- rss->bfd.cb = rtp_bfd_cb;
-}
-
-/*! \brief create a new RTP/RTCP socket and bind it */
-struct rtp_socket *rtp_socket_create(void)
-{
- int rc;
- struct rtp_socket *rs;
-
- DEBUGP(DLMUX, "rtp_socket_create(): ");
-
- rs = talloc_zero(tall_bsc_ctx, struct rtp_socket);
- if (!rs)
- return NULL;
-
- INIT_LLIST_HEAD(&rs->rtp.tx_queue);
- INIT_LLIST_HEAD(&rs->rtcp.tx_queue);
-
- rc = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
- if (rc < 0)
- goto out_free;
-
- init_rss(&rs->rtp, rs, rc, RTP_PRIV_RTP);
- rc = osmo_fd_register(&rs->rtp.bfd);
- if (rc < 0)
- goto out_rtp_socket;
-
- rc = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
- if (rc < 0)
- goto out_rtp_bfd;
-
- init_rss(&rs->rtcp, rs, rc, RTP_PRIV_RTCP);
- rc = osmo_fd_register(&rs->rtcp.bfd);
- if (rc < 0)
- goto out_rtcp_socket;
-
- DEBUGPC(DLMUX, "success\n");
-
- rc = rtp_socket_bind(rs, INADDR_ANY);
- if (rc < 0)
- goto out_rtcp_bfd;
-
- return rs;
-
-out_rtcp_bfd:
- osmo_fd_unregister(&rs->rtcp.bfd);
-out_rtcp_socket:
- close(rs->rtcp.bfd.fd);
-out_rtp_bfd:
- osmo_fd_unregister(&rs->rtp.bfd);
-out_rtp_socket:
- close(rs->rtp.bfd.fd);
-out_free:
- talloc_free(rs);
- DEBUGPC(DLMUX, "failed\n");
- return NULL;
-}
-
-static int rtp_sub_socket_bind(struct rtp_sub_socket *rss, uint32_t ip,
- uint16_t port)
-{
- int rc;
- socklen_t alen = sizeof(rss->sin_local);
-
- rss->sin_local.sin_family = AF_INET;
- rss->sin_local.sin_addr.s_addr = htonl(ip);
- rss->sin_local.sin_port = htons(port);
- rss->bfd.when |= BSC_FD_READ;
-
- rc = bind(rss->bfd.fd, (struct sockaddr *)&rss->sin_local,
- sizeof(rss->sin_local));
- if (rc < 0)
- return rc;
-
- /* retrieve the address we actually bound to, in case we
- * passed INADDR_ANY as IP address */
- return getsockname(rss->bfd.fd, (struct sockaddr *)&rss->sin_local,
- &alen);
-}
-
-#define RTP_PORT_BASE 30000
-static unsigned int next_udp_port = RTP_PORT_BASE;
-
-/*! \brief bind a RTP socket to a specific local address
- * \param[in] rs RTP socket to be bound
- * \param[in] ip local IP address to which socket is to be bound
- */
-int rtp_socket_bind(struct rtp_socket *rs, uint32_t ip)
-{
- int rc = -EIO;
- struct in_addr ia;
-
- ia.s_addr = htonl(ip);
- DEBUGP(DLMUX, "rtp_socket_bind(rs=%p, IP=%s): ", rs,
- inet_ntoa(ia));
-
- /* try to bind to a consecutive pair of ports */
- for (next_udp_port = next_udp_port % 0xffff;
- next_udp_port < 0xffff; next_udp_port += 2) {
- rc = rtp_sub_socket_bind(&rs->rtp, ip, next_udp_port);
- if (rc != 0)
- continue;
-
- rc = rtp_sub_socket_bind(&rs->rtcp, ip, next_udp_port+1);
- if (rc == 0)
- break;
- }
- if (rc < 0) {
- DEBUGPC(DLMUX, "failed\n");
- return rc;
- }
-
- ia.s_addr = rs->rtp.sin_local.sin_addr.s_addr;
- DEBUGPC(DLMUX, "BOUND_IP=%s, BOUND_PORT=%u\n",
- inet_ntoa(ia), ntohs(rs->rtp.sin_local.sin_port));
- return ntohs(rs->rtp.sin_local.sin_port);
-}
-
-static int rtp_sub_socket_connect(struct rtp_sub_socket *rss,
- uint32_t ip, uint16_t port)
-{
- int rc;
- socklen_t alen = sizeof(rss->sin_local);
-
- rss->sin_remote.sin_family = AF_INET;
- rss->sin_remote.sin_addr.s_addr = htonl(ip);
- rss->sin_remote.sin_port = htons(port);
-
- rc = connect(rss->bfd.fd, (struct sockaddr *) &rss->sin_remote,
- sizeof(rss->sin_remote));
- if (rc < 0)
- return rc;
-
- return getsockname(rss->bfd.fd, (struct sockaddr *)&rss->sin_local,
- &alen);
-}
-
-/*! \brief 'connect' a RTP socket to a remote peer
- * \param[in] rs RTP socket to be connected
- * \param[in] ip remote IP address to which to connect
- * \param[in] port remote UDP port number to which to connect
- */
-int rtp_socket_connect(struct rtp_socket *rs, uint32_t ip, uint16_t port)
-{
- int rc;
- struct in_addr ia;
-
- ia.s_addr = htonl(ip);
- DEBUGP(DLMUX, "rtp_socket_connect(rs=%p, ip=%s, port=%u)\n",
- rs, inet_ntoa(ia), port);
-
- rc = rtp_sub_socket_connect(&rs->rtp, ip, port);
- if (rc < 0)
- return rc;
-
- return rtp_sub_socket_connect(&rs->rtcp, ip, port+1);
-}
-
-/*! \brief bind two RTP/RTCP sockets together in the proxy
- * \param[in] this First RTP socket
- * \param[in] other Second RTP socket
- */
-int rtp_socket_proxy(struct rtp_socket *this, struct rtp_socket *other)
-{
- DEBUGP(DLMUX, "rtp_socket_proxy(this=%p, other=%p)\n",
- this, other);
-
- this->rx_action = RTP_PROXY;
- this->proxy.other_sock = other;
-
- other->rx_action = RTP_PROXY;
- other->proxy.other_sock = this;
-
- return 0;
-}
-
-/*! \brief bind RTP/RTCP socket to application, disabling proxy
- * \param[in] this RTP socket
- * \param[in] net gsm_network argument to trau_tx_to_mncc()
- * \param[in] callref callref argument to trau_tx_to_mncc()
- */
-int rtp_socket_upstream(struct rtp_socket *this, struct gsm_network *net,
- uint32_t callref)
-{
- DEBUGP(DLMUX, "rtp_socket_proxy(this=%p, callref=%u)\n",
- this, callref);
-
- if (callref) {
- this->rx_action = RTP_RECV_UPSTREAM;
- this->receive.net = net;
- this->receive.callref = callref;
- } else
- this->rx_action = RTP_NONE;
-
- return 0;
-}
-
-static void free_tx_queue(struct rtp_sub_socket *rss)
-{
- struct msgb *msg;
-
- while ((msg = msgb_dequeue(&rss->tx_queue)))
- msgb_free(msg);
-}
-
-/*! \brief Free/release a previously allocated RTP socket
- * \param[in[] rs RTP/RTCP socket to be released
- */
-int rtp_socket_free(struct rtp_socket *rs)
-{
- DEBUGP(DLMUX, "rtp_socket_free(rs=%p)\n", rs);
-
- /* make sure we don't leave references dangling to us */
- if (rs->rx_action == RTP_PROXY &&
- rs->proxy.other_sock)
- rs->proxy.other_sock->proxy.other_sock = NULL;
-
- osmo_fd_unregister(&rs->rtp.bfd);
- close(rs->rtp.bfd.fd);
- free_tx_queue(&rs->rtp);
-
- osmo_fd_unregister(&rs->rtcp.bfd);
- close(rs->rtcp.bfd.fd);
- free_tx_queue(&rs->rtcp);
-
- talloc_free(rs);
-
- return 0;
-}
diff --git a/src/libtrau/trau_mux.c b/src/libtrau/trau_mux.c
deleted file mode 100644
index e570b93..0000000
--- a/src/libtrau/trau_mux.c
+++ /dev/null
@@ -1,547 +0,0 @@
-/* Simple TRAU frame reflector to route voice calls */
-
-/* (C) 2009 by Harald Welte <[email protected]>
- * All Rights Reserved
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <osmocom/bsc/gsm_data.h>
-#include <osmocom/abis/trau_frame.h>
-#include <osmocom/bsc/trau_mux.h>
-#include <osmocom/abis/subchan_demux.h>
-#include <osmocom/abis/e1_input.h>
-#include <osmocom/bsc/debug.h>
-#include <osmocom/core/talloc.h>
-#include <osmocom/bsc/trau_upqueue.h>
-#include <osmocom/core/crcgen.h>
-#include <osmocom/bsc/transaction.h>
-
-/* this corresponds to the bit-lengths of the individual codec
- * parameters as indicated in Table 1.1 of TS 06.10 */
-static const uint8_t gsm_fr_map[] = {
- 6, 6, 5, 5, 4, 4, 3, 3,
- 7, 2, 2, 6, 3, 3, 3, 3,
- 3, 3, 3, 3, 3, 3, 3, 3,
- 3, 7, 2, 2, 6, 3, 3, 3,
- 3, 3, 3, 3, 3, 3, 3, 3,
- 3, 3, 7, 2, 2, 6, 3, 3,
- 3, 3, 3, 3, 3, 3, 3, 3,
- 3, 3, 3, 7, 2, 2, 6, 3,
- 3, 3, 3, 3, 3, 3, 3, 3,
- 3, 3, 3, 3
-};
-
-
-/*
- * EFR TRAU parity
- *
- * g(x) = x^3 + x^1 + 1
- */
-static const struct osmo_crc8gen_code gsm0860_efr_crc3 = {
- .bits = 3,
- .poly = 0x3,
- .init = 0x0,
- .remainder = 0x7,
-};
-
-/* EFR parity bits */
-static inline void efr_parity_bits_1(ubit_t *check_bits, const ubit_t *d_bits)
-{
- memcpy(check_bits + 0 , d_bits + 0, 22);
- memcpy(check_bits + 22 , d_bits + 24, 3);
- check_bits[25] = d_bits[28];
-}
-
-static inline void efr_parity_bits_2(ubit_t *check_bits, const ubit_t *d_bits)
-{
- memcpy(check_bits + 0 , d_bits + 42, 10);
- memcpy(check_bits + 10 , d_bits + 90, 2);
-}
-
-static inline void efr_parity_bits_3(ubit_t *check_bits, const ubit_t *d_bits)
-{
- memcpy(check_bits + 0 , d_bits + 98, 5);
- check_bits[5] = d_bits[104];
- memcpy(check_bits + 6 , d_bits + 143, 2);
-}
-
-static inline void efr_parity_bits_4(ubit_t *check_bits, const ubit_t *d_bits)
-{
- memcpy(check_bits + 0 , d_bits + 151, 10);
- memcpy(check_bits + 10 , d_bits + 199, 2);
-}
-
-static inline void efr_parity_bits_5(ubit_t *check_bits, const ubit_t *d_bits)
-{
- memcpy(check_bits + 0 , d_bits + 207, 5);
- check_bits[5] = d_bits[213];
- memcpy(check_bits + 6 , d_bits + 252, 2);
-}
-
-struct map_entry {
- struct llist_head list;
- struct gsm_e1_subslot src, dst;
-};
-
-struct upqueue_entry {
- struct llist_head list;
- struct gsm_network *net;
- struct gsm_e1_subslot src;
- uint32_t callref;
-};
-
-static LLIST_HEAD(ss_map);
-static LLIST_HEAD(ss_upqueue);
-
-void *tall_map_ctx, *tall_upq_ctx;
-
-/* map one particular subslot to another subslot */
-int trau_mux_map(const struct gsm_e1_subslot *src,
- const struct gsm_e1_subslot *dst)
-{
- struct map_entry *me;
-
- me = talloc(tall_map_ctx, struct map_entry);
- if (!me) {
- LOGP(DLMIB, LOGL_FATAL, "Out of memory\n");
- return -ENOMEM;
- }
-
- DEBUGP(DCC, "Setting up TRAU mux map between (e1=%u,ts=%u,ss=%u) "
- "and (e1=%u,ts=%u,ss=%u)\n",
- src->e1_nr, src->e1_ts, src->e1_ts_ss,
- dst->e1_nr, dst->e1_ts, dst->e1_ts_ss);
-
- /* make sure to get rid of any stale old mappings */
- trau_mux_unmap(src, 0);
- trau_mux_unmap(dst, 0);
-
- memcpy(&me->src, src, sizeof(me->src));
- memcpy(&me->dst, dst, sizeof(me->dst));
- llist_add(&me->list, &ss_map);
-
- return 0;
-}
-
-int trau_mux_map_lchan(const struct gsm_lchan *src,
- const struct gsm_lchan *dst)
-{
- struct gsm_e1_subslot *src_ss, *dst_ss;
-
- src_ss = &src->ts->e1_link;
- dst_ss = &dst->ts->e1_link;
-
- return trau_mux_map(src_ss, dst_ss);
-}
-
-
-/* unmap one particular subslot from another subslot */
-int trau_mux_unmap(const struct gsm_e1_subslot *ss, uint32_t callref)
-{
- struct map_entry *me, *me2;
- struct upqueue_entry *ue, *ue2;
-
- if (ss)
- llist_for_each_entry_safe(me, me2, &ss_map, list) {
- if (!memcmp(&me->src, ss, sizeof(*ss)) ||
- !memcmp(&me->dst, ss, sizeof(*ss))) {
- llist_del(&me->list);
- return 0;
- }
- }
- llist_for_each_entry_safe(ue, ue2, &ss_upqueue, list) {
- if (ue->callref == callref) {
- llist_del(&ue->list);
- return 0;
- }
- if (ss && !memcmp(&ue->src, ss, sizeof(*ss))) {
- llist_del(&ue->list);
- return 0;
- }
- }
- return -ENOENT;
-}
-
-/* look-up an enty in the TRAU mux map */
-static struct gsm_e1_subslot *
-lookup_trau_mux_map(const struct gsm_e1_subslot *src)
-{
- struct map_entry *me;
-
- llist_for_each_entry(me, &ss_map, list) {
- if (!memcmp(&me->src, src, sizeof(*src)))
- return &me->dst;
- if (!memcmp(&me->dst, src, sizeof(*src)))
- return &me->src;
- }
- return NULL;
-}
-
-/* look-up an enty in the TRAU upqueue */
-struct upqueue_entry *
-lookup_trau_upqueue(const struct gsm_e1_subslot *src)
-{
- struct upqueue_entry *ue;
-
- llist_for_each_entry(ue, &ss_upqueue, list) {
- if (!memcmp(&ue->src, src, sizeof(*src)))
- return ue;
- }
- return NULL;
-}
-
-static const uint8_t c_bits_check_fr[] = { 0, 0, 0, 1, 0 };
-static const uint8_t c_bits_check_efr[] = { 1, 1, 0, 1, 0 };
-
-struct msgb *trau_decode_fr(uint32_t callref,
- const struct decoded_trau_frame *tf)
-{
- struct msgb *msg;
- struct gsm_data_frame *frame;
- unsigned char *data;
- int i, j, k, l, o;
-
- msg = msgb_alloc(sizeof(struct gsm_data_frame) + 33,
- "GSM-DATA");
- if (!msg)
- return NULL;
-
- frame = (struct gsm_data_frame *)msg->data;
- memset(frame, 0, sizeof(struct gsm_data_frame));
- data = frame->data;
- data[0] = 0xd << 4;
- /* reassemble d-bits */
- i = 0; /* counts bits */
- j = 4; /* counts output bits */
- k = gsm_fr_map[0]-1; /* current number bit in element */
- l = 0; /* counts element bits */
- o = 0; /* offset input bits */
- while (i < 260) {
- data[j/8] |= (tf->d_bits[k+o] << (7-(j%8)));
- /* to avoid out-of-bounds access in gsm_fr_map[++l] */
- if (i == 259)
- break;
- if (--k < 0) {
- o += gsm_fr_map[l];
- k = gsm_fr_map[++l]-1;
- }
- i++;
- j++;
- }
- if (tf->c_bits[11]) /* BFI */
- frame->msg_type = GSM_BAD_FRAME;
- else
- frame->msg_type = GSM_TCHF_FRAME;
- frame->callref = callref;
- msgb_put(msg, sizeof(struct gsm_data_frame) + 33);
-
- return msg;
-}
-
-struct msgb *trau_decode_efr(uint32_t callref,
- const struct decoded_trau_frame *tf)
-{
- struct msgb *msg;
- struct gsm_data_frame *frame;
- unsigned char *data;
- int i, j, rc;
- ubit_t check_bits[26];
-
- msg = msgb_alloc(sizeof(struct gsm_data_frame) + 31,
- "GSM-DATA");
- if (!msg)
- return NULL;
-
- frame = (struct gsm_data_frame *)msg->data;
- memset(frame, 0, sizeof(struct gsm_data_frame));
- frame->msg_type = GSM_TCHF_FRAME_EFR;
- frame->callref = callref;
- msgb_put(msg, sizeof(struct gsm_data_frame) + 31);
-
- if (tf->c_bits[11]) /* BFI */
- goto bad_frame;
-
- data = frame->data;
- data[0] = 0xc << 4;
- /* reassemble d-bits */
- for (i = 1, j = 4; i < 39; i++, j++)
- data[j/8] |= (tf->d_bits[i] << (7-(j%8)));
- efr_parity_bits_1(check_bits, tf->d_bits);
- rc = osmo_crc8gen_check_bits(&gsm0860_efr_crc3, check_bits, 26,
- tf->d_bits + 39);
- if (rc)
- goto bad_frame;
- for (i = 42, j = 42; i < 95; i++, j++)
- data[j/8] |= (tf->d_bits[i] << (7-(j%8)));
- efr_parity_bits_2(check_bits, tf->d_bits);
- rc = osmo_crc8gen_check_bits(&gsm0860_efr_crc3, check_bits, 12,
- tf->d_bits + 95);
- if (rc)
- goto bad_frame;
- for (i = 98, j = 95; i < 148; i++, j++)
- data[j/8] |= (tf->d_bits[i] << (7-(j%8)));
- efr_parity_bits_3(check_bits, tf->d_bits);
- rc = osmo_crc8gen_check_bits(&gsm0860_efr_crc3, check_bits, 8,
- tf->d_bits + 148);
- if (rc)
- goto bad_frame;
- for (i = 151, j = 145; i < 204; i++, j++)
- data[j/8] |= (tf->d_bits[i] << (7-(j%8)));
- efr_parity_bits_4(check_bits, tf->d_bits);
- rc = osmo_crc8gen_check_bits(&gsm0860_efr_crc3, check_bits, 12,
- tf->d_bits + 204);
- if (rc)
- goto bad_frame;
- for (i = 207, j = 198; i < 257; i++, j++)
- data[j/8] |= (tf->d_bits[i] << (7-(j%8)));
- efr_parity_bits_5(check_bits, tf->d_bits);
- rc = osmo_crc8gen_check_bits(&gsm0860_efr_crc3, check_bits, 8,
- tf->d_bits + 257);
- if (rc)
- goto bad_frame;
-
- return msg;
-
-bad_frame:
- frame->msg_type = GSM_BAD_FRAME;
-
- return msg;
-}
-
-/* we get called by subchan_demux */
-int trau_mux_input(struct gsm_e1_subslot *src_e1_ss,
- const uint8_t *trau_bits, int num_bits)
-{
- struct decoded_trau_frame tf;
- uint8_t trau_bits_out[TRAU_FRAME_BITS];
- struct gsm_e1_subslot *dst_e1_ss = lookup_trau_mux_map(src_e1_ss);
- struct subch_mux *mx;
- struct upqueue_entry *ue;
- int rc;
-
- /* decode TRAU, change it to downlink, re-encode */
- rc = decode_trau_frame(&tf, trau_bits);
- if (rc)
- return rc;
-
- if (!dst_e1_ss) {
- struct msgb *msg = NULL;
- /* frame shall be sent to upqueue */
- if (!(ue = lookup_trau_upqueue(src_e1_ss)))
- return -EINVAL;
- if (!ue->callref)
- return -EINVAL;
- if (!memcmp(tf.c_bits, c_bits_check_fr, 5))
- msg = trau_decode_fr(ue->callref, &tf);
- else if (!memcmp(tf.c_bits, c_bits_check_efr, 5))
- msg = trau_decode_efr(ue->callref, &tf);
- else {
- DEBUGPC(DLMUX, "illegal trau (C1-C5) %s\n",
- osmo_hexdump(tf.c_bits, 5));
- DEBUGPC(DLMUX, "test trau (C1-C5) %s\n",
- osmo_hexdump(c_bits_check_efr, 5));
- return -EINVAL;
- }
- if (!msg)
- return -ENOMEM;
- trau_tx_to_mncc(ue->net, msg);
-
- return 0;
- }
-
- mx = e1inp_get_mux(dst_e1_ss->e1_nr, dst_e1_ss->e1_ts);
- if (!mx)
- return -EINVAL;
-
- trau_frame_up2down(&tf);
- encode_trau_frame(trau_bits_out, &tf);
-
- /* and send it to the muxer */
- return subchan_mux_enqueue(mx, dst_e1_ss->e1_ts_ss, trau_bits_out,
- TRAU_FRAME_BITS);
-}
-
-/* callback when a TRAU frame was received */
-int subch_cb(struct subch_demux *dmx, int ch, uint8_t *data, int len,
- void *_priv)
-{
- struct e1inp_ts *e1i_ts = _priv;
- struct gsm_e1_subslot src_ss;
-
- src_ss.e1_nr = e1i_ts->line->num;
- src_ss.e1_ts = e1i_ts->num;
- src_ss.e1_ts_ss = ch;
-
- return trau_mux_input(&src_ss, data, len);
-}
-
-/* add receiver instance for lchan and callref */
-int trau_recv_lchan(struct gsm_lchan *lchan, uint32_t callref)
-{
- struct gsm_e1_subslot *src_ss;
- struct upqueue_entry *ue;
-
- ue = talloc(tall_upq_ctx, struct upqueue_entry);
- if (!ue)
- return -ENOMEM;
-
- src_ss = &lchan->ts->e1_link;
-
- DEBUGP(DCC, "Setting up TRAU receiver (e1=%u,ts=%u,ss=%u) "
- "and (callref 0x%x)\n",
- src_ss->e1_nr, src_ss->e1_ts, src_ss->e1_ts_ss,
- callref);
-
- /* make sure to get rid of any stale old mappings */
- trau_mux_unmap(src_ss, callref);
-
- memcpy(&ue->src, src_ss, sizeof(ue->src));
- ue->net = lchan->ts->trx->bts->network;
- ue->callref = callref;
- llist_add(&ue->list, &ss_upqueue);
-
- return 0;
-}
-
-void trau_encode_fr(struct decoded_trau_frame *tf,
- const unsigned char *data)
-{
- int i, j, k, l, o;
-
- /* set c-bits and t-bits */
- tf->c_bits[0] = 1;
- tf->c_bits[1] = 1;
- tf->c_bits[2] = 1;
- tf->c_bits[3] = 0;
- tf->c_bits[4] = 0;
- memset(&tf->c_bits[5], 0, 6);
- memset(&tf->c_bits[11], 1, 10);
- memset(&tf->t_bits[0], 1, 4);
- /* reassemble d-bits */
- i = 0; /* counts bits */
- j = 4; /* counts input bits */
- k = gsm_fr_map[0]-1; /* current number bit in element */
- l = 0; /* counts element bits */
- o = 0; /* offset output bits */
- while (i < 260) {
- tf->d_bits[k+o] = (data[j/8] >> (7-(j%8))) & 1;
- /* to avoid out-of-bounds access in gsm_fr_map[++l] */
- if (i == 259)
- break;
- if (--k < 0) {
- o += gsm_fr_map[l];
- k = gsm_fr_map[++l]-1;
- }
- i++;
- j++;
- }
-}
-
-void trau_encode_efr(struct decoded_trau_frame *tf,
- const unsigned char *data)
-{
- int i, j;
- ubit_t check_bits[26];
-
- /* set c-bits and t-bits */
- tf->c_bits[0] = 1;
- tf->c_bits[1] = 1;
- tf->c_bits[2] = 0;
- tf->c_bits[3] = 1;
- tf->c_bits[4] = 0;
- memset(&tf->c_bits[5], 0, 6);
- memset(&tf->c_bits[11], 1, 10);
- memset(&tf->t_bits[0], 1, 4);
- /* reassemble d-bits */
- tf->d_bits[0] = 1;
- for (i = 1, j = 4; i < 39; i++, j++)
- tf->d_bits[i] = (data[j/8] >> (7-(j%8))) & 1;
- efr_parity_bits_1(check_bits, tf->d_bits);
- osmo_crc8gen_set_bits(&gsm0860_efr_crc3, check_bits, 26,
- tf->d_bits + 39);
- for (i = 42, j = 42; i < 95; i++, j++)
- tf->d_bits[i] = (data[j/8] >> (7-(j%8))) & 1;
- efr_parity_bits_2(check_bits, tf->d_bits);
- osmo_crc8gen_set_bits(&gsm0860_efr_crc3, check_bits, 12,
- tf->d_bits + 95);
- for (i = 98, j = 95; i < 148; i++, j++)
- tf->d_bits[i] = (data[j/8] >> (7-(j%8))) & 1;
- efr_parity_bits_3(check_bits, tf->d_bits);
- osmo_crc8gen_set_bits(&gsm0860_efr_crc3, check_bits, 8,
- tf->d_bits + 148);
- for (i = 151, j = 145; i < 204; i++, j++)
- tf->d_bits[i] = (data[j/8] >> (7-(j%8))) & 1;
- efr_parity_bits_4(check_bits, tf->d_bits);
- osmo_crc8gen_set_bits(&gsm0860_efr_crc3, check_bits, 12,
- tf->d_bits + 204);
- for (i = 207, j = 198; i < 257; i++, j++)
- tf->d_bits[i] = (data[j/8] >> (7-(j%8))) & 1;
- efr_parity_bits_5(check_bits, tf->d_bits);
- osmo_crc8gen_set_bits(&gsm0860_efr_crc3, check_bits, 8,
- tf->d_bits + 257);
-}
-
-int trau_send_frame(struct gsm_lchan *lchan, struct gsm_data_frame *frame)
-{
- uint8_t trau_bits_out[TRAU_FRAME_BITS];
- struct gsm_e1_subslot *dst_e1_ss = &lchan->ts->e1_link;
- struct subch_mux *mx;
- struct decoded_trau_frame tf;
-
- mx = e1inp_get_mux(dst_e1_ss->e1_nr, dst_e1_ss->e1_ts);
- if (!mx)
- return -EINVAL;
-
- switch (frame->msg_type) {
- case GSM_TCHF_FRAME:
- trau_encode_fr(&tf, frame->data);
- break;
- case GSM_TCHF_FRAME_EFR:
- trau_encode_efr(&tf, frame->data);
- break;
- default:
- DEBUGPC(DLMUX, "unsupported message type %d\n",
- frame->msg_type);
- return -EINVAL;
- }
-
- encode_trau_frame(trau_bits_out, &tf);
-
- /* and send it to the muxer */
- return subchan_mux_enqueue(mx, dst_e1_ss->e1_ts_ss, trau_bits_out,
- TRAU_FRAME_BITS);
-}
-
-/* switch trau muxer to new lchan */
-int switch_trau_mux(struct gsm_lchan *old_lchan, struct gsm_lchan *new_lchan)
-{
- struct gsm_network *net = old_lchan->ts->trx->bts->network;
- struct gsm_trans *trans;
-
- /* look up transaction with TCH frame receive enabled */
- llist_for_each_entry(trans, &net->trans_list, entry) {
- if (trans->conn && trans->conn->lchan == old_lchan &&
trans->tch_recv) {
- /* switch */
- trau_recv_lchan(new_lchan, trans->callref);
- }
- }
-
- return 0;
-}
diff --git a/src/libtrau/trau_upqueue.c b/src/libtrau/trau_upqueue.c
deleted file mode 100644
index c1c0003..0000000
--- a/src/libtrau/trau_upqueue.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* trau_upqueue.c - Pass msgb's up the chain */
-
-/* (C) 2010 by Harald Welte <[email protected]>
- * All Rights Reserved
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <osmocom/bsc/mncc.h>
-#include <osmocom/bsc/gsm_data.h>
-
-void trau_tx_to_mncc(struct gsm_network *net, struct msgb *msg)
-{
- net->mncc_recv(net, msg);
-}
diff --git a/src/osmo-bsc/Makefile.am b/src/osmo-bsc/Makefile.am
index 7db698c..4acbe56 100644
--- a/src/osmo-bsc/Makefile.am
+++ b/src/osmo-bsc/Makefile.am
@@ -40,12 +40,10 @@
osmo_bsc_ctrl.c \
$(NULL)
-# once again since TRAU uses CC symbol :(
osmo_bsc_LDADD = \
$(top_builddir)/src/libfilter/libfilter.a \
$(top_builddir)/src/libbsc/libbsc.a \
$(top_builddir)/src/libcommon-cs/libcommon-cs.a \
- $(top_builddir)/src/libtrau/libtrau.a \
$(top_builddir)/src/libcommon/libcommon.a \
$(LIBOSMOSCCP_LIBS) \
$(LIBOSMOCORE_LIBS) \
diff --git a/src/osmo-bsc/osmo_bsc_filter.c b/src/osmo-bsc/osmo_bsc_filter.c
index 2b71b85..17dddf8 100644
--- a/src/osmo-bsc/osmo_bsc_filter.c
+++ b/src/osmo-bsc/osmo_bsc_filter.c
@@ -22,7 +22,6 @@
#include <osmocom/bsc/osmo_bsc.h>
#include <osmocom/bsc/bsc_msc_data.h>
#include <osmocom/bsc/gsm_04_80.h>
-#include <osmocom/bsc/gsm_subscriber.h>
#include <osmocom/bsc/bsc_subscriber.h>
#include <osmocom/bsc/debug.h>
#include <osmocom/bsc/paging.h>
diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c
index 5d25701..829f207 100644
--- a/src/osmo-bsc/osmo_bsc_main.c
+++ b/src/osmo-bsc/osmo_bsc_main.c
@@ -201,7 +201,7 @@
osmo_stats_init(tall_bsc_ctx);
/* Allocate global gsm_network struct */
- rc = bsc_network_alloc(NULL);
+ rc = bsc_network_alloc();
if (rc) {
fprintf(stderr, "Allocation failed. exiting.\n");
exit(1);
diff --git a/src/osmo-bsc_nat/Makefile.am b/src/osmo-bsc_nat/Makefile.am
index dd20ddb..1bee68e 100644
--- a/src/osmo-bsc_nat/Makefile.am
+++ b/src/osmo-bsc_nat/Makefile.am
@@ -42,7 +42,6 @@
$(top_builddir)/src/libfilter/libfilter.a \
$(top_builddir)/src/libbsc/libbsc.a \
$(top_builddir)/src/libcommon-cs/libcommon-cs.a \
- $(top_builddir)/src/libtrau/libtrau.a \
$(top_builddir)/src/libcommon/libcommon.a \
$(LIBOSMOSCCP_LIBS) \
$(LIBOSMOCORE_LIBS) \
diff --git a/src/osmo-bsc_nat/bsc_filter.c b/src/osmo-bsc_nat/bsc_filter.c
index 8d4a680..77ef583 100644
--- a/src/osmo-bsc_nat/bsc_filter.c
+++ b/src/osmo-bsc_nat/bsc_filter.c
@@ -20,6 +20,8 @@
*
*/
+#include <string.h>
+
#include <osmocom/bsc/bsc_nat.h>
#include <osmocom/bsc/bsc_nat_sccp.h>
#include <osmocom/bsc/ipaccess.h>
diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
index d3f6d62..78d4965 100644
--- a/src/utils/Makefile.am
+++ b/src/utils/Makefile.am
@@ -49,7 +49,6 @@
bs11_config_LDADD = \
$(top_builddir)/src/libbsc/libbsc.a \
$(top_builddir)/src/libcommon-cs/libcommon-cs.a \
- $(top_builddir)/src/libtrau/libtrau.a \
$(top_builddir)/src/libcommon/libcommon.a \
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOGSM_LIBS) \
diff --git a/src/utils/bs11_config.c b/src/utils/bs11_config.c
index 6487df2..c72a23a 100644
--- a/src/utils/bs11_config.c
+++ b/src/utils/bs11_config.c
@@ -897,7 +897,7 @@
handle_options(argc, argv);
bts_model_bs11_init();
- gsmnet = bsc_network_init(tall_bs11cfg_ctx, 1, 1, NULL);
+ gsmnet = bsc_network_init(tall_bs11cfg_ctx, 1, 1);
if (!gsmnet) {
fprintf(stderr, "Unable to allocate gsm network\n");
exit(1);
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7b4656b..9207434 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -3,7 +3,6 @@
gsm0408 \
channel \
abis \
- trau \
subscr \
nanobts_omlattr \
bsc-nat \
diff --git a/tests/abis/Makefile.am b/tests/abis/Makefile.am
index 8dc6248..137321c 100644
--- a/tests/abis/Makefile.am
+++ b/tests/abis/Makefile.am
@@ -28,7 +28,6 @@
$(top_builddir)/src/libbsc/libbsc.a \
$(top_builddir)/src/libcommon/libcommon.a \
$(top_builddir)/src/libcommon-cs/libcommon-cs.a \
- $(top_builddir)/src/libtrau/libtrau.a \
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOABIS_LIBS) \
$(LIBOSMOGSM_LIBS) \
diff --git a/tests/bsc-nat-trie/Makefile.am b/tests/bsc-nat-trie/Makefile.am
index 6663897..d20bd0a 100644
--- a/tests/bsc-nat-trie/Makefile.am
+++ b/tests/bsc-nat-trie/Makefile.am
@@ -11,7 +11,6 @@
bsc_nat_trie_test_SOURCES = bsc_nat_trie_test.c \
$(top_srcdir)/src/osmo-bsc_nat/bsc_nat_rewrite_trie.c
bsc_nat_trie_test_LDADD = $(top_builddir)/src/libbsc/libbsc.a \
- $(top_builddir)/src/libtrau/libtrau.a \
$(top_builddir)/src/libcommon/libcommon.a \
$(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) -lrt \
$(LIBOSMOSCCP_LIBS) $(LIBOSMOVTY_LIBS) \
diff --git a/tests/bsc-nat/Makefile.am b/tests/bsc-nat/Makefile.am
index 74838a9..7f6730e 100644
--- a/tests/bsc-nat/Makefile.am
+++ b/tests/bsc-nat/Makefile.am
@@ -46,7 +46,6 @@
$(top_builddir)/src/libfilter/libfilter.a \
$(top_builddir)/src/libbsc/libbsc.a \
$(top_builddir)/src/libcommon-cs/libcommon-cs.a \
- $(top_builddir)/src/libtrau/libtrau.a \
$(top_builddir)/src/libcommon/libcommon.a \
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOGSM_LIBS) \
diff --git a/tests/bsc/Makefile.am b/tests/bsc/Makefile.am
index 90bbb4a..96f87f5 100644
--- a/tests/bsc/Makefile.am
+++ b/tests/bsc/Makefile.am
@@ -34,7 +34,6 @@
bsc_test_LDADD = \
$(top_builddir)/src/libbsc/libbsc.a \
$(top_builddir)/src/libcommon-cs/libcommon-cs.a \
- $(top_builddir)/src/libtrau/libtrau.a \
$(top_builddir)/src/libcommon/libcommon.a \
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOGSM_LIBS) \
diff --git a/tests/bsc/bsc_test.c b/tests/bsc/bsc_test.c
index aedc018..1d7baa1 100644
--- a/tests/bsc/bsc_test.c
+++ b/tests/bsc/bsc_test.c
@@ -30,7 +30,6 @@
#include <osmocom/bsc/osmo_bsc.h>
#include <osmocom/bsc/bsc_msc_data.h>
#include <osmocom/bsc/gsm_04_80.h>
-#include <osmocom/bsc/gsm_subscriber.h>
#include <osmocom/core/application.h>
#include <osmocom/core/backtrace.h>
diff --git a/tests/bssap/Makefile.am b/tests/bssap/Makefile.am
index 4bbe9ea..77309c9 100644
--- a/tests/bssap/Makefile.am
+++ b/tests/bssap/Makefile.am
@@ -36,7 +36,6 @@
$(top_builddir)/src/libbsc/libbsc.a \
$(top_builddir)/src/libcommon/libcommon.a \
$(top_builddir)/src/libcommon-cs/libcommon-cs.a \
- $(top_builddir)/src/libtrau/libtrau.a \
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOGSM_LIBS) \
$(LIBOSMOABIS_LIBS) \
diff --git a/tests/bssap/bssap_test.c b/tests/bssap/bssap_test.c
index 2b154c1..579cae2 100644
--- a/tests/bssap/bssap_test.c
+++ b/tests/bssap/bssap_test.c
@@ -82,7 +82,7 @@
struct gsm_network *net;
struct bsc_msc_data *msc;
- net = bsc_network_init(NULL, 1, 1, NULL);
+ net = bsc_network_init(NULL, 1, 1);
net->bsc_data->rf_ctrl = talloc_zero(NULL, struct osmo_bsc_rf);
net->bsc_data->rf_ctrl->policy = S_RF_ON;
diff --git a/tests/channel/channel_test.c b/tests/channel/channel_test.c
index ec2927e..7957b14 100644
--- a/tests/channel/channel_test.c
+++ b/tests/channel/channel_test.c
@@ -28,7 +28,6 @@
#include <osmocom/bsc/common_bsc.h>
#include <osmocom/bsc/abis_rsl.h>
#include <osmocom/bsc/debug.h>
-#include <osmocom/bsc/gsm_subscriber.h>
void test_bts_debug_print(void)
{
@@ -39,7 +38,7 @@
printf("Testing the lchan printing:");
/* Create a dummy network */
- network = bsc_network_init(tall_bsc_ctx, 1, 1, NULL);
+ network = bsc_network_init(tall_bsc_ctx, 1, 1);
if (!network)
exit(1);
/* Add a BTS with some reasonanbly non-zero id */
diff --git a/tests/gsm0408/Makefile.am b/tests/gsm0408/Makefile.am
index 3bf4a22..c5ae061 100644
--- a/tests/gsm0408/Makefile.am
+++ b/tests/gsm0408/Makefile.am
@@ -25,7 +25,6 @@
gsm0408_test_LDADD = \
$(top_builddir)/src/libbsc/libbsc.a \
$(top_builddir)/src/libcommon-cs/libcommon-cs.a \
- $(top_builddir)/src/libtrau/libtrau.a \
$(top_builddir)/src/libcommon/libcommon.a \
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOGSM_LIBS) \
diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c
index 72a1772..77cd1e8 100644
--- a/tests/gsm0408/gsm0408_test.c
+++ b/tests/gsm0408/gsm0408_test.c
@@ -25,7 +25,7 @@
#include <arpa/inet.h>
#include <osmocom/bsc/common_bsc.h>
-#include <osmocom/bsc/gsm_subscriber.h>
+#include <osmocom/bsc/gsm_data.h>
#include <osmocom/bsc/gsm_data_shared.h>
#include <osmocom/bsc/debug.h>
#include <osmocom/bsc/arfcn_range_encode.h>
@@ -147,7 +147,7 @@
static inline void test_si2q_segfault(void)
{
struct gsm_bts *bts;
- struct gsm_network *network = bsc_network_init(tall_bsc_ctx, 1, 1,
NULL);
+ struct gsm_network *network = bsc_network_init(tall_bsc_ctx, 1, 1);
printf("Test SI2quater UARFCN (same scrambling code and diversity):\n");
if (!network)
@@ -162,7 +162,7 @@
static inline void test_si2q_mu(void)
{
struct gsm_bts *bts;
- struct gsm_network *network = bsc_network_init(tall_bsc_ctx, 1, 1,
NULL);
+ struct gsm_network *network = bsc_network_init(tall_bsc_ctx, 1, 1);
printf("Test SI2quater multiple UARFCNs:\n");
if (!network)
@@ -181,7 +181,7 @@
static inline void test_si2q_u(void)
{
struct gsm_bts *bts;
- struct gsm_network *network = bsc_network_init(NULL, 1, 1, NULL);
+ struct gsm_network *network = bsc_network_init(NULL, 1, 1);
printf("Testing SYSINFO_TYPE_2quater UARFCN generation:\n");
if (!network)
@@ -209,7 +209,7 @@
static inline void test_si2q_e(void)
{
struct gsm_bts *bts;
- struct gsm_network *network = bsc_network_init(NULL, 1, 1, NULL);
+ struct gsm_network *network = bsc_network_init(NULL, 1, 1);
printf("Testing SYSINFO_TYPE_2quater EARFCN generation:\n");
if (!network)
@@ -242,7 +242,7 @@
static inline void test_si2q_long(void)
{
struct gsm_bts *bts;
- struct gsm_network *network = bsc_network_init(tall_bsc_ctx, 1, 1,
NULL);
+ struct gsm_network *network = bsc_network_init(tall_bsc_ctx, 1, 1);
printf("Testing SYSINFO_TYPE_2quater combined EARFCN & UARFCN
generation:\n");
if (!network)
@@ -649,7 +649,7 @@
static void test_si_ba_ind(void)
{
- struct gsm_network *network = bsc_network_init(tall_bsc_ctx, 1, 1,
NULL);
+ struct gsm_network *network = bsc_network_init(tall_bsc_ctx, 1, 1);
struct gsm_bts *bts = gsm_bts_alloc(network, 0);
const struct gsm48_system_information_type_2 *si2 =
(struct gsm48_system_information_type_2 *) GSM_BTS_SI(bts,
SYSINFO_TYPE_2);
diff --git a/tests/nanobts_omlattr/Makefile.am
b/tests/nanobts_omlattr/Makefile.am
index 4b49518..336ccaf 100644
--- a/tests/nanobts_omlattr/Makefile.am
+++ b/tests/nanobts_omlattr/Makefile.am
@@ -24,7 +24,6 @@
nanobts_omlattr_test_LDADD = \
$(top_builddir)/src/libbsc/libbsc.a \
- $(top_builddir)/src/libtrau/libtrau.a \
$(top_builddir)/src/libcommon/libcommon.a \
$(top_builddir)/src/libcommon-cs/libcommon-cs.a \
$(LIBOSMOCORE_LIBS) \
diff --git a/tests/subscr/Makefile.am b/tests/subscr/Makefile.am
index 5b770bc..b743063 100644
--- a/tests/subscr/Makefile.am
+++ b/tests/subscr/Makefile.am
@@ -33,7 +33,6 @@
bsc_subscr_test_LDADD = \
$(top_builddir)/src/libbsc/libbsc.a \
$(top_builddir)/src/libcommon-cs/libcommon-cs.a \
- $(top_builddir)/src/libtrau/libtrau.a \
$(top_builddir)/src/libcommon/libcommon.a \
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOABIS_LIBS) \
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 13f54e1..6ef3f29 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -39,12 +39,6 @@
AT_CHECK([$abs_top_builddir/tests/bsc/bsc_test], [], [expout], [ignore])
AT_CLEANUP
-AT_SETUP([trau])
-AT_KEYWORDS([trau])
-cat $abs_srcdir/trau/trau_test.ok > expout
-AT_CHECK([$abs_top_builddir/tests/trau/trau_test], [], [expout], [ignore])
-AT_CLEANUP
-
AT_SETUP([nanobts_omlattr])
AT_KEYWORDS([nanobts_omlattr])
cat $abs_srcdir/nanobts_omlattr/nanobts_omlattr_test.ok > expout
diff --git a/tests/trau/Makefile.am b/tests/trau/Makefile.am
deleted file mode 100644
index b51c184..0000000
--- a/tests/trau/Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
-AM_CPPFLAGS = \
- $(all_includes) \
- -I$(top_srcdir)/include \
- $(NULL)
-
-AM_CFLAGS = \
- -Wall \
- -ggdb3 \
- $(LIBOSMOCORE_CFLAGS) \
- $(LIBOSMOGSM_CFLAGS) \
- $(LIBOSMOABIS_CFLAGS) \
- $(LIBSMPP34_CFLAGS) \
- $(COVERAGE_CFLAGS) \
- $(NULL)
-
-AM_LDFLAGS = \
- $(COVERAGE_LDFLAGS) \
- $(NULL)
-
-EXTRA_DIST = \
- trau_test.ok \
- $(NULL)
-
-noinst_PROGRAMS = \
- trau_test \
- $(NULL)
-
-trau_test_SOURCES = \
- trau_test.c \
- $(NULL)
-
-trau_test_LDADD = \
- $(top_builddir)/src/libbsc/libbsc.a \
- $(top_builddir)/src/libcommon-cs/libcommon-cs.a \
- $(top_builddir)/src/libtrau/libtrau.a \
- $(top_builddir)/src/libcommon/libcommon.a \
- $(LIBOSMOCORE_LIBS) \
- $(LIBOSMOABIS_LIBS) \
- $(LIBOSMOGSM_LIBS) \
- $(LIBSMPP34_LIBS) \
- $(LIBOSMOVTY_LIBS) \
- $(LIBRARY_DL) \
- $(NULL)
diff --git a/tests/trau/trau_test.c b/tests/trau/trau_test.c
deleted file mode 100644
index c8c9a5e..0000000
--- a/tests/trau/trau_test.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/* (C) 2013 by Andreas Eversberg <[email protected]>
- * All Rights Reserved
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <osmocom/abis/trau_frame.h>
-#include <osmocom/bsc/trau_mux.h>
-#include <osmocom/core/msgb.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-void test_trau_fr_efr(unsigned char *data)
-{
- struct decoded_trau_frame tf;
- struct msgb *msg;
- struct gsm_data_frame *frame;
-
- printf("Testing TRAU FR transcoding.\n");
- data[0] = 0xd0;
- trau_encode_fr(&tf, data);
- tf.c_bits[11] = 0; /* clear BFI */
- msg = trau_decode_fr(1, &tf);
- OSMO_ASSERT(msg != NULL);
- frame = (struct gsm_data_frame *)msg->data;
- OSMO_ASSERT(frame->msg_type == GSM_TCHF_FRAME);
- OSMO_ASSERT(!memcmp(frame->data, data, 33));
- msgb_free(msg);
-
- printf("Testing TRAU EFR transcoding.\n");
- data[0] = 0xc0;
- trau_encode_efr(&tf, data);
- OSMO_ASSERT(tf.d_bits[0] == 1); /* spare bit must be 1 */
- tf.c_bits[11] = 0; /* clear BFI */
- msg = trau_decode_efr(1, &tf);
- OSMO_ASSERT(msg != NULL);
- frame = (struct gsm_data_frame *)msg->data;
- OSMO_ASSERT(frame->msg_type == GSM_TCHF_FRAME_EFR);
- OSMO_ASSERT(!memcmp(frame->data, data, 31));
-
- printf("Testing TRAU EFR decoding with CRC error.\n");
- tf.d_bits[0] = 0; /* spare bit must be included */
- msg = trau_decode_efr(1, &tf);
- OSMO_ASSERT(msg != NULL);
- frame = (struct gsm_data_frame *)msg->data;
- OSMO_ASSERT(frame->msg_type == GSM_BAD_FRAME);
- msgb_free(msg);
-}
-
-int main()
-{
- unsigned char data[33];
- int i;
-
- msgb_talloc_ctx_init(NULL, 0);
-
- memset(data, 0x00, sizeof(data));
- test_trau_fr_efr(data);
- memset(data, 0xff, sizeof(data));
- test_trau_fr_efr(data);
- srandom(42);
- for (i = 0; i < sizeof(data); i++)
- data[i] = random();
- test_trau_fr_efr(data);
- printf("Done\n");
- return 0;
-}
-
-/* stubs */
-void vty_out() {}
diff --git a/tests/trau/trau_test.ok b/tests/trau/trau_test.ok
deleted file mode 100644
index ef71230..0000000
--- a/tests/trau/trau_test.ok
+++ /dev/null
@@ -1,10 +0,0 @@
-Testing TRAU FR transcoding.
-Testing TRAU EFR transcoding.
-Testing TRAU EFR decoding with CRC error.
-Testing TRAU FR transcoding.
-Testing TRAU EFR transcoding.
-Testing TRAU EFR decoding with CRC error.
-Testing TRAU FR transcoding.
-Testing TRAU EFR transcoding.
-Testing TRAU EFR decoding with CRC error.
-Done
--
To view, visit https://gerrit.osmocom.org/5475
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8e0af56a158f25a4f1384d667c03eb20e72df5b8
Gerrit-PatchSet: 1
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <[email protected]>
