diff options
| author | Harald Welte <laforge@gnumonks.org> | 2017-07-12 21:19:06 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2017-07-13 21:35:33 +0200 |
| commit | 3cda4ff532d8c4c794c6d111d1a57691b744722e (patch) | |
| tree | 17fbbbc8633bd95b3effa09d994f732d0116f7a8 | |
| parent | 1f45db0ff5b5ee62397ae7da688876d7ce664233 (diff) | |
VIRT-PHY: Fix handling of default values for vty configuration
The defaults must be set during bts_model_phy_link_set_defaults()
and can then later be overridden by the vty (from the config file).
They should only be written back to the file if they differ from
the default settings.
Change-Id: I5d7f2c1dc8bc3d11db5c607b664730e4dcd58c96
| -rw-r--r-- | src/osmo-bts-virtual/l1_if.c | 12 | ||||
| -rw-r--r-- | src/osmo-bts-virtual/main.c | 4 | ||||
| -rw-r--r-- | src/osmo-bts-virtual/virtualbts_vty.c | 4 |
3 files changed, 6 insertions, 14 deletions
diff --git a/src/osmo-bts-virtual/l1_if.c b/src/osmo-bts-virtual/l1_if.c index a9319166..36b2748b 100644 --- a/src/osmo-bts-virtual/l1_if.c +++ b/src/osmo-bts-virtual/l1_if.c @@ -186,18 +186,6 @@ int bts_model_phy_link_open(struct phy_link *plink) phy_link_state_set(plink, PHY_LINK_CONNECTING); - if (!plink->u.virt.bts_mcast_group) - plink->u.virt.bts_mcast_group = DEFAULT_BTS_MCAST_GROUP; - - if (!plink->u.virt.bts_mcast_port) - plink->u.virt.bts_mcast_port = DEFAULT_BTS_MCAST_PORT; - - if (!plink->u.virt.ms_mcast_group) - plink->u.virt.ms_mcast_group = DEFAULT_MS_MCAST_GROUP; - - if (!plink->u.virt.ms_mcast_port) - plink->u.virt.ms_mcast_port = DEFAULT_MS_MCAST_PORT; - plink->u.virt.virt_um = virt_um_init(plink, plink->u.virt.ms_mcast_group, plink->u.virt.ms_mcast_port, plink->u.virt.bts_mcast_group, plink->u.virt.bts_mcast_port, virt_um_rcv_cb); diff --git a/src/osmo-bts-virtual/main.c b/src/osmo-bts-virtual/main.c index 6ceeaecd..f1dc2931 100644 --- a/src/osmo-bts-virtual/main.c +++ b/src/osmo-bts-virtual/main.c @@ -104,6 +104,10 @@ void bts_model_abis_close(struct gsm_bts *bts) void bts_model_phy_link_set_defaults(struct phy_link *plink) { + plink->u.virt.bts_mcast_group = DEFAULT_BTS_MCAST_GROUP; + plink->u.virt.bts_mcast_port = DEFAULT_BTS_MCAST_PORT; + plink->u.virt.ms_mcast_group = DEFAULT_MS_MCAST_GROUP; + plink->u.virt.ms_mcast_port = DEFAULT_MS_MCAST_PORT; } void bts_model_phy_instance_set_defaults(struct phy_instance *pinst) diff --git a/src/osmo-bts-virtual/virtualbts_vty.c b/src/osmo-bts-virtual/virtualbts_vty.c index 45c10861..323222b4 100644 --- a/src/osmo-bts-virtual/virtualbts_vty.c +++ b/src/osmo-bts-virtual/virtualbts_vty.c @@ -72,13 +72,13 @@ void bts_model_config_write_phy(struct vty *vty, struct phy_link *plink) if (strcmp(plink->u.virt.ms_mcast_group, DEFAULT_BTS_MCAST_GROUP)) vty_out(vty, " virtual-um ms-multicast-group %s%s", plink->u.virt.ms_mcast_group, VTY_NEWLINE); - if (plink->u.virt.ms_mcast_port) + if (plink->u.virt.ms_mcast_port != DEFAULT_BTS_MCAST_PORT) vty_out(vty, " virtual-um ms-udp-port %u%s", plink->u.virt.ms_mcast_port, VTY_NEWLINE); if (strcmp(plink->u.virt.bts_mcast_group, DEFAULT_MS_MCAST_GROUP)) vty_out(vty, " virtual-um bts-multicast-group %s%s", plink->u.virt.bts_mcast_group, VTY_NEWLINE); - if (plink->u.virt.bts_mcast_port) + if (plink->u.virt.bts_mcast_port != DEFAULT_MS_MCAST_PORT) vty_out(vty, " virtual-um bts-udp-port %u%s", plink->u.virt.bts_mcast_port, VTY_NEWLINE); |