[S] Change in osmo-mgw[master]: mgcp-client: Mark client as UP when keepalive request-interval/timeou...

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/33468 ) Change subject: mgcp-client: Mark client as UP when keepalive request-interval/timeout is disabled through VTY ...................................................................... mgcp-client: Mark client as UP when keepalive request-interval/timeout is disabled through VTY This way if keepalive becomes disabled for an MGW, it can be selected again (otherwise it would become non-selectable forever, and we already have a "blocked" config for that). Fixes: 563386e8bbf0bc6d9050d87f79208d6784e219cf Related: SYS#6481 Change-Id: I263d23885a1a967f844033f9810b96691b8e3b30 --- M src/libosmo-mgcp-client/mgcp_client_vty.c 1 file changed, 31 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/libosmo-mgcp-client/mgcp_client_vty.c b/src/libosmo-mgcp-client/mgcp_client_vty.c index a164637..d57447c 100644 --- a/src/libosmo-mgcp-client/mgcp_client_vty.c +++ b/src/libosmo-mgcp-client/mgcp_client_vty.c @@ -323,10 +323,15 @@ /* If client already exists, apply the change immediately if possible: */ mgcp->actual.keepalive.req_interval_sec = atoi(argv[0]); if (mgcp->wq.bfd.fd != -1) { /* UDP MGCP socket connected */ - if (mgcp->actual.keepalive.req_interval_sec > 0) /* Re-schedule: */ + if (mgcp->actual.keepalive.req_interval_sec > 0) { + /* Re-schedule: */ osmo_timer_schedule(&mgcp->keepalive_tx_timer, mgcp->actual.keepalive.req_interval_sec, 0); - else if (osmo_timer_pending(&mgcp->keepalive_tx_timer)) - osmo_timer_del(&mgcp->keepalive_tx_timer); + } else { + if (osmo_timer_pending(&mgcp->keepalive_tx_timer)) + osmo_timer_del(&mgcp->keepalive_tx_timer); + /* Assume link is UP by default, so that this MGW can be selected: */ + mgcp->conn_up = true; + } } /* else: wait until connect() to do first scheduling */ return CMD_SUCCESS; @@ -371,10 +376,15 @@ /* If client already exists, apply the change immediately if possible: */ mgcp->actual.keepalive.timeout_sec = atoi(argv[0]); if (mgcp->wq.bfd.fd != -1) { /* UDP MGCP socket connected */ - if (mgcp->actual.keepalive.timeout_sec > 0) /* Re-schedule: */ + if (mgcp->actual.keepalive.timeout_sec > 0) { + /* Re-schedule: */ osmo_timer_schedule(&mgcp->keepalive_rx_timer, mgcp->actual.keepalive.timeout_sec, 0); - else if (osmo_timer_pending(&mgcp->keepalive_rx_timer)) - osmo_timer_del(&mgcp->keepalive_rx_timer); + } else { + if (osmo_timer_pending(&mgcp->keepalive_rx_timer)) + osmo_timer_del(&mgcp->keepalive_rx_timer); + /* Assume link is UP by default, so that this MGW can be selected: */ + mgcp->conn_up = true; + } } /* else: wait until connect() to do first scheduling */ return CMD_SUCCESS; -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/33468 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I263d23885a1a967f844033f9810b96691b8e3b30 Gerrit-Change-Number: 33468 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged