From 9199f8b60ddf0821e2df7ddafee4bf27b1c454a8 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Wed, 14 Feb 2018 00:13:47 +0100 Subject: dead code removal Related: OS#2528 Change-Id: I89157c446d66e11adbe3cad587eb34ec40271c12 --- include/osmocom/msc/gsm_04_08.h | 2 - include/osmocom/msc/gsm_data.h | 95 ----------------------------------- include/osmocom/msc/gsm_data_shared.h | 4 -- src/libmsc/vty_interface_layer3.c | 6 +-- 4 files changed, 2 insertions(+), 105 deletions(-) diff --git a/include/osmocom/msc/gsm_04_08.h b/include/osmocom/msc/gsm_04_08.h index 58cb7ae25..f059d7594 100644 --- a/include/osmocom/msc/gsm_04_08.h +++ b/include/osmocom/msc/gsm_04_08.h @@ -31,9 +31,7 @@ void gsm0408_clear_all_trans(struct gsm_network *net, int protocol); int gsm0408_dispatch(struct gsm_subscriber_connection *conn, struct msgb *msg); int gsm0408_rcvmsg(struct msgb *msg, uint8_t link_id); -enum gsm_chan_t get_ctype_by_chreq(struct gsm_network *bts, uint8_t ra); /* don't use "enum gsm_chreq_reason_t" to avoid circular dependency */ -int get_reason_by_chreq(uint8_t ra, int neci); void gsm_net_update_ctype(struct gsm_network *net); int gsm48_tx_mm_info(struct gsm_subscriber_connection *conn); diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 561cf3d47..444618cb4 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -25,51 +25,19 @@ /** annotations for msgb ownership */ #define __uses -#define OBSC_NM_W_ACK_CB(__msgb) (__msgb)->cb[3] - struct mncc_sock_state; -struct gsm_subscriber_group; struct vlr_instance; struct vlr_subscr; struct ranap_ue_conn_ctx; -#define OBSC_LINKID_CB(__msgb) (__msgb)->cb[3] - #define tmsi_from_string(str) strtoul(str, NULL, 10) -/* 3-bit long values */ -#define EARFCN_PRIO_INVALID 8 -#define EARFCN_MEAS_BW_INVALID 8 -/* 5-bit long values */ -#define EARFCN_QRXLV_INVALID 32 -#define EARFCN_THRESH_LOW_INVALID 32 - -enum gsm_security_event { - GSM_SECURITY_NOAVAIL, - GSM_SECURITY_AUTH_FAILED, - GSM_SECURITY_SUCCEEDED, - GSM_SECURITY_ALREADY, -}; - struct msgb; typedef int gsm_cbfn(unsigned int hooknum, unsigned int event, struct msgb *msg, void *data, void *param); -/* Real authentication information containing Ki */ -enum gsm_auth_algo { - AUTH_ALGO_NONE, - AUTH_ALGO_XOR, - AUTH_ALGO_COMP128v1, -}; - -struct gsm_auth_info { - enum gsm_auth_algo auth_algo; - unsigned int a3a8_ki_len; - uint8_t a3a8_ki[16]; -}; - struct gsm_auth_tuple { int use_count; int key_seq; @@ -77,37 +45,6 @@ struct gsm_auth_tuple { }; #define GSM_KEY_SEQ_INVAL 7 /* GSM 04.08 - 10.5.1.2 */ -/* - * AUTHENTICATION/CIPHERING state - */ -struct gsm_security_operation { - struct gsm_auth_tuple atuple; - gsm_cbfn *cb; - void *cb_data; -}; - -/* - * A dummy to keep a connection up for at least - * a couple of seconds to work around MSC issues. - */ -struct gsm_anchor_operation { - struct osmo_timer_list timeout; -}; - -/* Maximum number of neighbor cells whose average we track */ -#define MAX_NEIGH_MEAS 10 -/* Maximum size of the averaging window for neighbor cells */ -#define MAX_WIN_NEIGH_AVG 10 - -/* processed neighbor measurements for one cell */ -struct neigh_meas_proc { - uint16_t arfcn; - uint8_t bsic; - uint8_t rxlev[MAX_WIN_NEIGH_AVG]; - unsigned int rxlev_cnt; - uint8_t last_seen_nr; -}; - enum ran_type { RAN_UNKNOWN, RAN_GERAN_A, /* 2G / A-interface */ @@ -155,12 +92,6 @@ struct gsm_subscriber_connection { /* SMS helpers for libmsc */ uint8_t next_rp_ref; - /* - * Operations that have a state and might be pending - */ - struct gsm_security_operation *sec_operation; - struct gsm_anchor_operation *anch_operation; - struct osmo_fsm_inst *conn_fsm; /* Are we part of a special "silent" call */ @@ -311,26 +242,11 @@ struct gsm_network { /* bit-mask of permitted encryption algorithms. LSB=A5/0, MSB=A5/7 */ uint8_t a5_encryption_mask; bool authentication_required; - int neci; int send_mm_info; struct { int active; - /* Window RXLEV averaging */ - unsigned int win_rxlev_avg; /* number of SACCH frames */ - /* Window RXQUAL averaging */ - unsigned int win_rxqual_avg; /* number of SACCH frames */ - /* Window RXLEV neighbouring cells averaging */ - unsigned int win_rxlev_avg_neigh; /* number of SACCH frames */ - - /* how often should we check for power budget HO */ - unsigned int pwr_interval; /* SACCH frames */ - /* how much better does a neighbor cell have to be ? */ - unsigned int pwr_hysteresis; /* dBm */ - /* maximum distacne before we try a handover */ - unsigned int max_distance; /* TA values */ } handover; - struct rate_ctr_group *bsc_ctrs; struct rate_ctr_group *msc_ctrs; struct osmo_counter *active_calls; @@ -347,22 +263,11 @@ struct gsm_network { unsigned int paging_response_timer; - /* timer to expire old location updates */ - struct osmo_timer_list subscr_expire_timer; - /* Radio Resource Location Protocol (TS 04.31) */ struct { enum rrlp_mode mode; } rrlp; - enum gsm_chan_t ctype_by_chreq[18]; - - /* Use a TCH for handling requests of type paging any */ - int pag_any_tch; - - /* MSC data in case we are a true BSC */ - struct osmo_bsc_data *bsc_data; - struct gsm_sms_queue *sms_queue; /* control interface */ diff --git a/include/osmocom/msc/gsm_data_shared.h b/include/osmocom/msc/gsm_data_shared.h index 857946dc9..af7d89d32 100644 --- a/include/osmocom/msc/gsm_data_shared.h +++ b/include/osmocom/msc/gsm_data_shared.h @@ -41,10 +41,6 @@ enum gsm_paging_event { GSM_PAGING_BUSY, }; -struct gsm_mncc; -struct osmo_rtp_socket; -struct rtp_socket; - /* * help with parsing regexps */ diff --git a/src/libmsc/vty_interface_layer3.c b/src/libmsc/vty_interface_layer3.c index 9a3ff019a..6ed2ade8d 100644 --- a/src/libmsc/vty_interface_layer3.c +++ b/src/libmsc/vty_interface_layer3.c @@ -58,13 +58,13 @@ extern struct gsm_network *gsmnet_from_vty(struct vty *v); static void vty_conn_hdr(struct vty *vty) { - vty_out(vty, "--ConnId ------------Subscriber RAN --LAC Use --Tokens CSA A5 State%s", + vty_out(vty, "--ConnId ------------Subscriber RAN --LAC Use --Tokens C A5 State%s", VTY_NEWLINE); } static void vty_dump_one_conn(struct vty *vty, const struct gsm_subscriber_connection *conn) { - vty_out(vty, "%08x %22s %3s %5u %3u %08x %c%c%c /%1u %27s %s", + vty_out(vty, "%08x %22s %3s %5u %3u %08x %c /%1u %27s %s", conn->a.conn_id, conn->vsub ? vlr_subscr_name(conn->vsub) : "-", conn->via_ran == RAN_UTRAN_IU ? "Iu" : "A", @@ -72,8 +72,6 @@ static void vty_dump_one_conn(struct vty *vty, const struct gsm_subscriber_conne conn->use_count, conn->use_tokens, conn->received_cm_service_request ? 'C' : '-', - conn->sec_operation ? 'S' : '-', - conn->anch_operation ? 'A' : '-', conn->encr.alg_id, conn->conn_fsm ? osmo_fsm_inst_state_name(conn->conn_fsm) : "-", VTY_NEWLINE); -- cgit v1.2.3