From 2f8117d2147b711669518bbacd24df6dd2a76124 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Fri, 4 Mar 2016 14:56:26 +0100 Subject: disable code trying to reach across BSC/MSC bounds, make build pass Disable ipacc_rtp_direct, Osmo SMPP TLVs, Ctrl interface and channel_test. These need to be reimplemented with proper separation of libs. Add some tall_* pointers the linker requires for osmo-cscn. --- openbsc/src/osmo-cscn/cscn_main.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'openbsc/src/osmo-cscn') diff --git a/openbsc/src/osmo-cscn/cscn_main.c b/openbsc/src/osmo-cscn/cscn_main.c index 374f9bd82..96ee0b3b0 100644 --- a/openbsc/src/osmo-cscn/cscn_main.c +++ b/openbsc/src/osmo-cscn/cscn_main.c @@ -51,6 +51,7 @@ #include #include #include +#include #include #include #include @@ -84,6 +85,14 @@ static const char * const osmocscn_copyright = void *tall_cscn_ctx = NULL; +/* satisfy deps from libbsc legacy. + TODO double check these */ +void *tall_fle_ctx = NULL; +void *tall_paging_ctx = NULL; +void *tall_map_ctx = NULL; +void *tall_upq_ctx = NULL; +/* end deps from libbsc legacy. */ + static struct { const char *database_name; const char *config_file; @@ -194,9 +203,11 @@ static void handle_options(int argc, char **argv) case 'T': log_set_print_timestamp(osmo_stderr_target, 1); break; +#if BEFORE_MSCSPLIT case 'P': ipacc_rtp_direct = 0; break; +#endif case 'e': log_set_log_level(osmo_stderr_target, atoi(optarg)); break; @@ -393,6 +404,9 @@ int main(int argc, char **argv) bsc_api_init(cscn_network, msc_bsc_api()); // pobably not. #endif +#if 0 + the bsc_ctrl_node_lookup() only returns BSC specific ctrl nodes + /* start control interface after reading config for * ctrl_vty_get_bind_addr() */ LOGP(DNM, LOGL_NOTICE, "CTRL at %s %d\n", @@ -404,6 +418,7 @@ int main(int argc, char **argv) printf("Failed to initialize control interface. Exiting.\n"); return -1; } +#endif #if 0 TODO: we probably want some of the _net_ ctrl commands from bsc_base_ctrl_cmds_install(). @@ -413,10 +428,12 @@ TODO: we probably want some of the _net_ ctrl commands from bsc_base_ctrl_cmds_i } #endif +#if 0 if (msc_ctrl_cmds_install() != 0) { printf("Failed to initialize the MSC control commands.\n"); return -1; } +#endif /* seed the PRNG */ srand(time(NULL)); -- cgit v1.2.3