diff options
| author | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2016-02-23 15:10:33 +0100 |
|---|---|---|
| committer | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2016-02-25 12:18:04 +0100 |
| commit | 73828152d9472d5977a18491f2d9ca9b24077f43 (patch) | |
| tree | 72d54bdd16bd2efa3f750825bff79771b7310fe7 /openbsc/include | |
| parent | fc7add20e1b54e1b0d10c7457629507fb62d7d31 (diff) | |
enable ctrl bind config for various programs
Add ctrl_vty_init() calls and feed the ctrl_vty_get_bind_addr() return value to
ctrl_interface_setup() in the following programs:
osmo-bsc
osmo-bsc_nat
osmo-nitb
osmo-sgsn
For osmo-sgsn, move the control interface setup invocation below the config
parsing, so that the ctrl_vty_get_bind_addr() can return the configured
address.
Diffstat (limited to 'openbsc/include')
| -rw-r--r-- | openbsc/include/openbsc/bsc_nat.h | 3 | ||||
| -rw-r--r-- | openbsc/include/openbsc/ctrl.h | 3 | ||||
| -rw-r--r-- | openbsc/include/openbsc/gprs_sgsn.h | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/openbsc/include/openbsc/bsc_nat.h b/openbsc/include/openbsc/bsc_nat.h index 027b6ded4..309adb1ba 100644 --- a/openbsc/include/openbsc/bsc_nat.h +++ b/openbsc/include/openbsc/bsc_nat.h @@ -423,7 +423,8 @@ void bsc_nat_num_rewr_entry_adapt(void *ctx, struct llist_head *head, const stru void bsc_nat_send_mgcp_to_msc(struct bsc_nat *bsc_nat, struct msgb *msg); void bsc_nat_handle_mgcp(struct bsc_nat *bsc, struct msgb *msg); -struct ctrl_handle *bsc_nat_controlif_setup(struct bsc_nat *nat, int port); +struct ctrl_handle *bsc_nat_controlif_setup(struct bsc_nat *nat, + const char *bind_addr, int port); void bsc_nat_ctrl_del_pending(struct bsc_cmd_list *pending); int bsc_nat_handle_ctrlif_msg(struct bsc_connection *bsc, struct msgb *msg); diff --git a/openbsc/include/openbsc/ctrl.h b/openbsc/include/openbsc/ctrl.h index 38fa054db..c5ac21092 100644 --- a/openbsc/include/openbsc/ctrl.h +++ b/openbsc/include/openbsc/ctrl.h @@ -1,3 +1,4 @@ #pragma once -struct ctrl_handle *bsc_controlif_setup(struct gsm_network *net, uint16_t port); +struct ctrl_handle *bsc_controlif_setup(struct gsm_network *net, + const char *bind_addr, uint16_t port); diff --git a/openbsc/include/openbsc/gprs_sgsn.h b/openbsc/include/openbsc/gprs_sgsn.h index 74f073597..49d5407f5 100644 --- a/openbsc/include/openbsc/gprs_sgsn.h +++ b/openbsc/include/openbsc/gprs_sgsn.h @@ -315,7 +315,8 @@ int sgsn_force_reattach_oldmsg(struct msgb *oldmsg); * ctrl interface related work */ struct gsm_network; -struct ctrl_handle *sgsn_controlif_setup(struct gsm_network *, uint16_t port); +struct ctrl_handle *sgsn_controlif_setup(struct gsm_network *, + const char *bind_addr, uint16_t port); int sgsn_ctrl_cmds_install(void); /* |