From edb377854282e0efe1acd5c6ad400bf7817efc8b Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Fri, 1 May 2009 14:59:07 +0000 Subject: * Add support for multiple ip.access nanoBTS at one BSC * keep track of site_id/bts_id in struct gsm_bts * dynamically match incoming OML/RSL over TCP connections by BTS Unit ID * introduce new debug category DINP (separate from DMI for hexdumps) * remove ia_config() as it is no longer needed * * ensure that signalling links / E1 line information is correctly printed * when bootstrapping RSL or OML, tell us for which BTS it is being doen * separate bootstrap_bts() out from bootstrap_network() * statically configure two ip.access BTS, one with unit id's 1800/0/0 and 1801/0/0 --- include/openbsc/debug.h | 1 + include/openbsc/e1_input.h | 3 +-- include/openbsc/gsm_data.h | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/openbsc/debug.h b/include/openbsc/debug.h index ec9cbbb3c..626bcf545 100644 --- a/include/openbsc/debug.h +++ b/include/openbsc/debug.h @@ -16,6 +16,7 @@ #define DMI 0x1000 #define DMIB 0x2000 #define DMUX 0x4000 +#define DINP 0x8000 #ifdef DEBUG #define DEBUGP(ss, fmt, args...) debugp(ss, __FILE__, __LINE__, 0, fmt, ## args) diff --git a/include/openbsc/e1_input.h b/include/openbsc/e1_input.h index 8b9521d61..6d5a0be87 100644 --- a/include/openbsc/e1_input.h +++ b/include/openbsc/e1_input.h @@ -147,9 +147,8 @@ struct subch_mux *e1inp_get_mux(u_int8_t e1_nr, u_int8_t ts_nr); /* e1_config.c */ int e1_config(struct gsm_bts *bts, int cardnr, int release_l2); -int ia_config(struct gsm_bts *bts); int ia_config_connect(struct gsm_bts *bts, struct sockaddr_in *sin); -int ipaccess_setup(struct e1inp_line *line); +int ipaccess_setup(struct gsm_network *gsmnet); struct llist_head e1inp_driver_list; struct llist_head e1inp_line_list; diff --git a/include/openbsc/gsm_data.h b/include/openbsc/gsm_data.h index 6c08b0399..8ad127a16 100644 --- a/include/openbsc/gsm_data.h +++ b/include/openbsc/gsm_data.h @@ -296,6 +296,12 @@ struct gsm_bts { struct { struct gsm_nm_state nm_state; } site_mgr; + + /* ip.accesss Unit ID's have Site/BTS/TRX layout */ + struct { + u_int16_t site_id; + u_int16_t bts_id; + } ip_access; /* transceivers */ int num_trx; -- cgit v1.2.3