From 4d75877e61f13e80701b8436a5d71aa868f0d295 Mon Sep 17 00:00:00 2001 From: Vadim Yanitskiy Date: Sat, 23 Feb 2019 16:16:44 +0700 Subject: [PATCH] libmsc/sgs_vty.c: always write server address and VLR name Comparing an array to null is not useful, because the expression will always evaluate as true. Let's just always write SGs server address and VLR name, no mater whether default values are used or not, same as we do for the HLR address and port. Change-Id: If045e42fca0315b0777eb86c44bf934ce58b340b Fixes: CID#190871 Array compared against 0 (NO_EFFECT) --- src/libmsc/sgs_vty.c | 9 +++------ tests/test_nodes.vty | 1 + 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/libmsc/sgs_vty.c b/src/libmsc/sgs_vty.c index 5b26178d6..8c94301fd 100644 --- a/src/libmsc/sgs_vty.c +++ b/src/libmsc/sgs_vty.c @@ -158,12 +158,9 @@ static int config_write_sgs(struct vty *vty) char str_buf[256]; vty_out(vty, "sgs%s", VTY_NEWLINE); - if (sgs->cfg.local_port != SGS_PORT_DEFAULT) - vty_out(vty, " local-port %u%s", sgs->cfg.local_port, VTY_NEWLINE); - if (sgs->cfg.local_addr) - vty_out(vty, " local-ip %s%s", sgs->cfg.local_addr, VTY_NEWLINE); - if (sgs->cfg.vlr_name) - vty_out(vty, " vlr-name %s%s", sgs->cfg.vlr_name, VTY_NEWLINE); + vty_out(vty, " local-port %u%s", sgs->cfg.local_port, VTY_NEWLINE); + vty_out(vty, " local-ip %s%s", sgs->cfg.local_addr, VTY_NEWLINE); + vty_out(vty, " vlr-name %s%s", sgs->cfg.vlr_name, VTY_NEWLINE); for (i = 0; i < ARRAY_SIZE(sgs->cfg.timer); i++) { if (sgs->cfg.timer[i] == sgs_state_timer_defaults[i]) diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index fb9e5f051..8aceb867f 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -147,6 +147,7 @@ hlr remote-ip 127.0.0.1 remote-port 4222 sgs + local-port 29118 local-ip 0.0.0.0 vlr-name vlr.example.net end