diff options
Diffstat (limited to 'openbsc/src')
| -rw-r--r-- | openbsc/src/libmsc/mncc_builtin.c | 2 | ||||
| -rw-r--r-- | openbsc/src/libmsc/smpp_openbsc.c | 2 | ||||
| -rw-r--r-- | openbsc/src/osmo-cscn/cscn_main.c | 17 |
3 files changed, 21 insertions, 0 deletions
diff --git a/openbsc/src/libmsc/mncc_builtin.c b/openbsc/src/libmsc/mncc_builtin.c index d67035b40..46f86a15a 100644 --- a/openbsc/src/libmsc/mncc_builtin.c +++ b/openbsc/src/libmsc/mncc_builtin.c @@ -206,9 +206,11 @@ static int mncc_setup_cnf(struct gsm_call *call, int msg_type, bridge.callref[1] = call->remote_ref; DEBUGP(DMNCC, "(call %x) Bridging with remote.\n", call->callref); +#if BEFORE_MSCSPLIT /* in direct mode, we always have to bridge the channels */ if (ipacc_rtp_direct) return mncc_tx_to_cc(call->net, MNCC_BRIDGE, &bridge); +#endif /* proxy mode */ if (!net->handover.active) { diff --git a/openbsc/src/libmsc/smpp_openbsc.c b/openbsc/src/libmsc/smpp_openbsc.c index 3ac4ed988..7f28134d1 100644 --- a/openbsc/src/libmsc/smpp_openbsc.c +++ b/openbsc/src/libmsc/smpp_openbsc.c @@ -420,6 +420,7 @@ void append_tlv_u16(tlv_t **req_tlv, uint16_t tag, uint16_t val) build_tlv(req_tlv, &tlv); } +#if BEFORE_MSCSPLIT /* Append the Osmocom vendor-specific additional TLVs to a SMPP msg */ static void append_osmo_tlvs(tlv_t **req_tlv, const struct gsm_lchan *lchan) { @@ -458,6 +459,7 @@ static void append_osmo_tlvs(tlv_t **req_tlv, const struct gsm_lchan *lchan) (uint8_t *)subscr->equipment.imei, imei_len+1); } } +#endif static int deliver_to_esme(struct osmo_esme *esme, struct gsm_sms *sms, struct gsm_subscriber_connection *conn) 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 <openbsc/sms_queue.h> #include <osmocom/vty/telnet_interface.h> #include <osmocom/vty/ports.h> +#include <osmocom/vty/logging.h> #include <openbsc/vty.h> #include <openbsc/bss.h> #include <openbsc/mncc.h> @@ -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)); |