diff options
| author | Harald Welte <laforge@gnumonks.org> | 2014-08-24 16:55:30 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2014-08-24 16:59:05 +0200 |
| commit | 0ff0f2d00f37cd82a21e4638d15a8bb736419c8a (patch) | |
| tree | 9507d222a04cc4a6e86a71469f9e1bb3d792c30e | |
| parent | d9a2aa8d9909d93d96e421c7cb727932445fa8ab (diff) | |
ctrl_if: Move control interface to port 4238
... which is now defined in libosmocore
| -rw-r--r-- | include/osmo-bts/control_if.h | 2 | ||||
| -rw-r--r-- | src/common/bts_ctrl_lookup.c | 5 | ||||
| -rw-r--r-- | src/osmo-bts-sysmo/main.c | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/include/osmo-bts/control_if.h b/include/osmo-bts/control_if.h index e50238a4..d779d939 100644 --- a/include/osmo-bts/control_if.h +++ b/include/osmo-bts/control_if.h @@ -1,3 +1,3 @@ #pragma once -struct ctrl_handle *bts_controlif_setup(struct gsm_bts *bts, uint16_t port); +struct ctrl_handle *bts_controlif_setup(struct gsm_bts *bts); diff --git a/src/common/bts_ctrl_lookup.c b/src/common/bts_ctrl_lookup.c index ec6434e0..e6937180 100644 --- a/src/common/bts_ctrl_lookup.c +++ b/src/common/bts_ctrl_lookup.c @@ -23,6 +23,7 @@ #include <osmocom/vty/command.h> #include <osmocom/ctrl/control_if.h> +#include <osmocom/ctrl/ports.h> #include <osmo-bts/logging.h> #include <osmo-bts/gsm_data.h> @@ -84,12 +85,12 @@ err_index: return -ERANGE; } -struct ctrl_handle *bts_controlif_setup(struct gsm_bts *bts, uint16_t port) +struct ctrl_handle *bts_controlif_setup(struct gsm_bts *bts) { struct ctrl_handle *hdl; int rc = 0; - hdl = ctrl_interface_setup(bts, port, bts_ctrl_node_lookup); + hdl = ctrl_interface_setup(bts, OSMO_CTRL_PORT_BTS, bts_ctrl_node_lookup); if (!hdl) return NULL; diff --git a/src/osmo-bts-sysmo/main.c b/src/osmo-bts-sysmo/main.c index 8c930965..569b488d 100644 --- a/src/osmo-bts-sysmo/main.c +++ b/src/osmo-bts-sysmo/main.c @@ -351,7 +351,8 @@ int main(int argc, char **argv) } write_pid_file("osmo-bts"); - bts_controlif_setup(bts, 3333); + bts_controlif_setup(bts); + sysmobts_ctrlif_inst_cmds(); rc = telnet_init(tall_bts_ctx, NULL, 4241); if (rc < 0) { |