This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
pespin gerrit-no-reply at lists.osmocom.orgpespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22813 ) Change subject: Move bts_ident_key to bts.c ...................................................................... Move bts_ident_key to bts.c The function is not really handover specific, and will be used in other places in subsequent patches. Change-Id: Icae8b9045e497f850f22cb3b6f93acbf61b84746 --- M include/osmocom/bsc/bts.h M include/osmocom/bsc/handover.h M src/osmo-bsc/bts.c M src/osmo-bsc/handover_logic.c M tests/handover/Makefile.am M tests/handover/neighbor_ident_test.c 6 files changed, 154 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/13/22813/1 diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index 9a226f5..e1dd403 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -658,3 +658,5 @@ enum gsm_bts_type_variant str2btsvariant(const char *arg); const char *btsvariant2str(enum gsm_bts_type_variant v); + +struct neighbor_ident_key *bts_ident_key(const struct gsm_bts *bts); diff --git a/include/osmocom/bsc/handover.h b/include/osmocom/bsc/handover.h index d22ac86..a71bb98 100644 --- a/include/osmocom/bsc/handover.h +++ b/include/osmocom/bsc/handover.h @@ -86,8 +86,6 @@ struct gsm_subscriber_connection *conn, const struct neighbor_ident_key *search_for, bool log_errors); -struct neighbor_ident_key *bts_ident_key(const struct gsm_bts *bts); - void handover_parse_inter_bsc_mt(struct gsm_subscriber_connection *conn, struct msgb *ho_request_msg); diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 628d301..76da136 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -758,6 +758,17 @@ return 0; } +struct neighbor_ident_key *bts_ident_key(const struct gsm_bts *bts) +{ + static struct neighbor_ident_key key; + key = (struct neighbor_ident_key){ + .from_bts = NEIGHBOR_IDENT_KEY_ANY_BTS, + .arfcn = bts->c0->arfcn, + .bsic = bts->bsic, + }; + return &key; +} + const struct rate_ctr_desc bts_ctr_description[] = { [BTS_CTR_CHREQ_TOTAL] = \ { "chreq:total", diff --git a/src/osmo-bsc/handover_logic.c b/src/osmo-bsc/handover_logic.c index ade330d..b0d175a 100644 --- a/src/osmo-bsc/handover_logic.c +++ b/src/osmo-bsc/handover_logic.c @@ -322,17 +322,6 @@ return -ENODEV; } -struct neighbor_ident_key *bts_ident_key(const struct gsm_bts *bts) -{ - static struct neighbor_ident_key key; - key = (struct neighbor_ident_key){ - .from_bts = NEIGHBOR_IDENT_KEY_ANY_BTS, - .arfcn = bts->c0->arfcn, - .bsic = bts->bsic, - }; - return &key; -} - static int ho_logic_sig_cb(unsigned int subsys, unsigned int signal, void *handler_data, void *signal_data) { diff --git a/tests/handover/Makefile.am b/tests/handover/Makefile.am index 3951624..7ee4d10 100644 --- a/tests/handover/Makefile.am +++ b/tests/handover/Makefile.am @@ -123,10 +123,79 @@ $(NULL) neighbor_ident_test_LDADD = \ + $(top_builddir)/src/osmo-bsc/a_reset.o \ + $(top_builddir)/src/osmo-bsc/abis_nm.o \ + $(top_builddir)/src/osmo-bsc/abis_nm_vty.o \ + $(top_builddir)/src/osmo-bsc/abis_om2000.o \ + $(top_builddir)/src/osmo-bsc/abis_om2000_vty.o \ + $(top_builddir)/src/osmo-bsc/abis_rsl.o \ + $(top_builddir)/src/osmo-bsc/acc.o \ + $(top_builddir)/src/osmo-bsc/arfcn_range_encode.o \ + $(top_builddir)/src/osmo-bsc/assignment_fsm.o \ + $(top_builddir)/src/osmo-bsc/bsc_ctrl_commands.o \ + $(top_builddir)/src/osmo-bsc/bsc_init.o \ + $(top_builddir)/src/osmo-bsc/bsc_rf_ctrl.o \ + $(top_builddir)/src/osmo-bsc/bsc_rll.o \ + $(top_builddir)/src/osmo-bsc/bsc_subscr_conn_fsm.o \ + $(top_builddir)/src/osmo-bsc/bsc_subscriber.o \ + $(top_builddir)/src/osmo-bsc/bsc_vty.o \ + $(top_builddir)/src/osmo-bsc/bts.o \ + $(top_builddir)/src/osmo-bsc/bts_sm.o \ + $(top_builddir)/src/osmo-bsc/bts_trx.o \ + $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts.o \ + $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \ + $(top_builddir)/src/osmo-bsc/bts_unknown.o \ + $(top_builddir)/src/osmo-bsc/chan_alloc.o \ + $(top_builddir)/src/osmo-bsc/codec_pref.o \ + $(top_builddir)/src/osmo-bsc/gsm_04_08_rr.o \ + $(top_builddir)/src/osmo-bsc/gsm_data.o \ + $(top_builddir)/src/osmo-bsc/handover_cfg.o \ + $(top_builddir)/src/osmo-bsc/handover_decision.o \ + $(top_builddir)/src/osmo-bsc/handover_decision_2.o \ + $(top_builddir)/src/osmo-bsc/handover_fsm.o \ + $(top_builddir)/src/osmo-bsc/handover_logic.o \ + $(top_builddir)/src/osmo-bsc/handover_vty.o \ + $(top_builddir)/src/osmo-bsc/lchan_fsm.o \ + $(top_builddir)/src/osmo-bsc/lchan_rtp_fsm.o \ + $(top_builddir)/src/osmo-bsc/lchan_select.o \ + $(top_builddir)/src/osmo-bsc/meas_feed.o \ + $(top_builddir)/src/osmo-bsc/meas_rep.o \ $(top_builddir)/src/osmo-bsc/neighbor_ident.o \ + $(top_builddir)/src/osmo-bsc/neighbor_ident_vty.o \ + $(top_builddir)/src/osmo-bsc/net_init.o \ + $(top_builddir)/src/osmo-bsc/nm_common_fsm.o \ + $(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \ + $(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \ + $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \ + $(top_builddir)/src/osmo-bsc/nm_channel_fsm.o \ + $(top_builddir)/src/osmo-bsc/nm_gprs_cell_fsm.o \ + $(top_builddir)/src/osmo-bsc/nm_gprs_nse_fsm.o \ + $(top_builddir)/src/osmo-bsc/nm_gprs_nsvc_fsm.o \ + $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \ + $(top_builddir)/src/osmo-bsc/osmo_bsc_ctrl.o \ + $(top_builddir)/src/osmo-bsc/osmo_bsc_lcls.o \ + $(top_builddir)/src/osmo-bsc/osmo_bsc_mgcp.o \ + $(top_builddir)/src/osmo-bsc/osmo_bsc_msc.o \ + $(top_builddir)/src/osmo-bsc/paging.o \ + $(top_builddir)/src/osmo-bsc/pcu_sock.o \ + $(top_builddir)/src/osmo-bsc/penalty_timers.o \ + $(top_builddir)/src/osmo-bsc/system_information.o \ + $(top_builddir)/src/osmo-bsc/timeslot_fsm.o \ + $(top_builddir)/src/osmo-bsc/smscb.o \ + $(top_builddir)/src/osmo-bsc/cbch_scheduler.o \ + $(top_builddir)/src/osmo-bsc/cbsp_link.o \ + $(top_builddir)/src/osmo-bsc/lcs_loc_req.o \ + $(top_builddir)/src/osmo-bsc/lcs_ta_req.o \ + $(top_builddir)/src/osmo-bsc/lb.o \ + $(top_builddir)/src/osmo-bsc/bsc_sccp.o \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOCTRL_LIBS) \ + $(LIBOSMOVTY_LIBS) \ + $(LIBOSMOABIS_LIBS) \ + $(LIBOSMONETIF_LIBS) \ + $(LIBOSMOSIGTRAN_LIBS) \ + $(LIBOSMOMGCPCLIENT_LIBS) \ $(NULL) .PHONY: update_exp diff --git a/tests/handover/neighbor_ident_test.c b/tests/handover/neighbor_ident_test.c index 9acbea0..3a8f1c7 100644 --- a/tests/handover/neighbor_ident_test.c +++ b/tests/handover/neighbor_ident_test.c @@ -26,8 +26,34 @@ #include <osmocom/gsm/gsm0808.h> +#include <osmocom/mgcp_client/mgcp_client_endpoint_fsm.h> + #include <osmocom/bsc/neighbor_ident.h> +#include <osmocom/bsc/abis_rsl.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/bsc_subscriber.h> +#include <osmocom/bsc/lchan_select.h> +#include <osmocom/bsc/lchan_fsm.h> +#include <osmocom/bsc/handover_decision.h> +#include <osmocom/bsc/system_information.h> +#include <osmocom/bsc/handover.h> +#include <osmocom/bsc/handover_cfg.h> +#include <osmocom/bsc/handover_decision_2.h> +#include <osmocom/bsc/bss.h> +#include <osmocom/bsc/gsm_08_08.h> +#include <osmocom/bsc/osmo_bsc.h> +#include <osmocom/bsc/bsc_subscr_conn_fsm.h> +#include <osmocom/bsc/timeslot_fsm.h> +#include <osmocom/bsc/lchan_fsm.h> +#include <osmocom/bsc/handover_fsm.h> +#include <osmocom/bsc/bsc_msc_data.h> +#include <osmocom/bsc/bts.h> +#include <osmocom/bsc/paging.h> +#include <osmocom/bsc/vty.h> + +struct gsm_network *bsc_gsmnet; + static struct neighbor_ident_list *nil; static const struct neighbor_ident_key *k(int from_bts, uint16_t arfcn, uint8_t bsic) @@ -268,3 +294,49 @@ return 0; } + +void rtp_socket_free() {} +void rtp_send_frame() {} +void rtp_socket_upstream() {} +void rtp_socket_create() {} +void rtp_socket_connect() {} +void rtp_socket_proxy() {} +void trau_mux_unmap() {} +void trau_mux_map_lchan() {} +void trau_recv_lchan() {} +void trau_send_frame() {} +int osmo_bsc_sigtran_send(struct gsm_subscriber_connection *conn, struct msgb *msg) { return 0; } +int osmo_bsc_sigtran_open_conn(struct gsm_subscriber_connection *conn, struct msgb *msg) { return 0; } +void bsc_sapi_n_reject(struct gsm_subscriber_connection *conn, uint8_t dlci, enum gsm0808_cause cause) {} +void bsc_cipher_mode_compl(struct gsm_subscriber_connection *conn, struct msgb *msg, uint8_t chosen_encr) {} +int bsc_compl_l3(struct gsm_lchan *lchan, struct msgb *msg, uint16_t chosen_channel) +{ return 0; } +int bsc_paging_start(struct bsc_paging_params *params) +{ return 0; } +void bsc_dtap(struct gsm_subscriber_connection *conn, uint8_t link_id, struct msgb *msg) {} +void bsc_assign_compl(struct gsm_subscriber_connection *conn, uint8_t rr_cause) {} +void bsc_cm_update(struct gsm_subscriber_connection *conn, + const uint8_t *cm2, uint8_t cm2_len, + const uint8_t *cm3, uint8_t cm3_len) {} +struct gsm0808_handover_required; +int bsc_tx_bssmap_ho_required(struct gsm_lchan *lchan, const struct gsm0808_cell_id_list2 *target_cells) +{ return 0; } +int bsc_tx_bssmap_ho_request_ack(struct gsm_subscriber_connection *conn, struct msgb *rr_ho_command) +{ return 0; } +int bsc_tx_bssmap_ho_detect(struct gsm_subscriber_connection *conn) { return 0; } +enum handover_result bsc_tx_bssmap_ho_complete(struct gsm_subscriber_connection *conn, + struct gsm_lchan *lchan) { return HO_RESULT_OK; } +void bsc_tx_bssmap_ho_failure(struct gsm_subscriber_connection *conn) {} +void osmo_bsc_sigtran_tx_reset(void) {} +void osmo_bsc_sigtran_tx_reset_ack(void) {} +void osmo_bsc_sigtran_reset(void) {} +void bssmap_reset_alloc(void) {} +void bssmap_reset_is_conn_ready(void) {} +const char *osmo_mgcpc_ep_name(const struct osmo_mgcpc_ep *ep) +{ + return "fake-ep"; +} +const char *osmo_mgcpc_ep_ci_name(const struct osmo_mgcpc_ep_ci *ci) +{ + return "fake-ci"; +} -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22813 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icae8b9045e497f850f22cb3b6f93acbf61b84746 Gerrit-Change-Number: 22813 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin at sysmocom.de> Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210210/7c6c1528/attachment.htm>