Change in osmocom-bb[master]: mobile: fix vty bind ip override
Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11457 ) Change subject: mobile: fix vty bind ip override .. mobile: fix vty bind ip override Previously the vty bind config parameter was always ignored. Fix this by using proper default value from the config unless it's explicitly set via command-line parameter. Change-Id: I32517567847fd5c54b1742f18bf409ff81e316fa --- M src/host/layer23/src/mobile/main.c 1 file changed, 4 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved diff --git a/src/host/layer23/src/mobile/main.c b/src/host/layer23/src/mobile/main.c index 115ac41..297a534 100644 --- a/src/host/layer23/src/mobile/main.c +++ b/src/host/layer23/src/mobile/main.c @@ -31,6 +31,7 @@ #include #include #include +#include #include @@ -51,7 +52,7 @@ static char *gsmtap_ip = 0; static const char *custom_cfg_file = NULL; struct gsmtap_inst *gsmtap_inst = NULL; -static char *vty_ip = "127.0.0.1"; +static char *vty_ip = NULL; unsigned short vty_port = 4247; char *config_dir = NULL; int use_mncc_sock = 0; @@ -90,7 +91,7 @@ printf(" -u --vty-ip The VTY IP to telnet to. " "(default %s)\n", vty_ip); printf(" -v --vty-port The VTY port number to telnet to. " - "(default %u)\n", vty_port); + "(default %s)\n", vty_get_bind_addr()); printf(" -d --debugChange debug flags. default: %s\n", debug_default); printf(" -D --daemonizeRun as daemon\n"); @@ -248,7 +249,7 @@ config_dir = dirname(config_dir); if (use_mncc_sock) - rc = l23_app_init(mncc_recv_socket, config_file, vty_ip, vty_port); + rc = l23_app_init(mncc_recv_socket, config_file, vty_ip ? vty_ip : vty_get_bind_addr(), vty_port); else rc = l23_app_init(NULL, config_file, vty_ip, vty_port); if (rc) -- To view, visit https://gerrit.osmocom.org/11457 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I32517567847fd5c54b1742f18bf409ff81e316fa Gerrit-Change-Number: 11457 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy
Change in osmocom-bb[master]: mobile: fix vty bind ip override
Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11457 ) Change subject: mobile: fix vty bind ip override .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11457 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I32517567847fd5c54b1742f18bf409ff81e316fa Gerrit-Change-Number: 11457 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 19 Nov 2018 16:39:32 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmocom-bb[master]: mobile: fix vty bind ip override
Max has posted comments on this change. ( https://gerrit.osmocom.org/11457 ) Change subject: mobile: fix vty bind ip override .. Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11457 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I32517567847fd5c54b1742f18bf409ff81e316fa Gerrit-Change-Number: 11457 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 19 Nov 2018 16:26:27 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmocom-bb[master]: mobile: fix vty bind ip override
Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11457 ) Change subject: mobile: fix vty bind ip override .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11457/1/src/host/layer23/src/mobile/main.c File src/host/layer23/src/mobile/main.c: https://gerrit.osmocom.org/#/c/11457/1/src/host/layer23/src/mobile/main.c@254 PS1, Line 254: use_custom_vty_ip You could just check 'vty_ip' against NULL. There is no need to introduce additional 'use_custom_vty_ip'... -- To view, visit https://gerrit.osmocom.org/11457 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I32517567847fd5c54b1742f18bf409ff81e316fa Gerrit-Change-Number: 11457 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 26 Oct 2018 08:50:19 + Gerrit-HasComments: Yes Gerrit-HasLabels: No
Change in osmocom-bb[master]: mobile: fix vty bind ip override
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11457 ) Change subject: mobile: fix vty bind ip override .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11457 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I32517567847fd5c54b1742f18bf409ff81e316fa Gerrit-Change-Number: 11457 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 25 Oct 2018 17:54:08 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmocom-bb[master]: mobile: fix vty bind ip override
Max has posted comments on this change. ( https://gerrit.osmocom.org/11457 ) Change subject: mobile: fix vty bind ip override .. Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11457 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I32517567847fd5c54b1742f18bf409ff81e316fa Gerrit-Change-Number: 11457 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 25 Oct 2018 15:05:24 + Gerrit-HasComments: No Gerrit-HasLabels: No