paulmataruso/osmo-mgw
1
0
Fork 0
mirror of https://gitea.osmocom.org/cellular-infrastructure/osmo-mgw.git synced 2025-10-23 08:12:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

mgcp-client: Mark client as UP when keepalive request-interval/timeout is disabled through VTY

Browse Source 
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: 563386e8bb
Related: SYS#6481
Change-Id: I263d23885a1a967f844033f9810b96691b8e3b30
This commit is contained in:
Pau Espin Pedrol
2023-06-26 18:49:33 +02:00
parent 4c0658955e
commit 10d9f8dcf4
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/libosmo-mgcp-client/mgcp_client_vty.c
View File

@@ -323,10 +323,15 @@ DEFUN(cfg_mgw_mgw_keepalive_req_interval,
/* 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 @@ DEFUN(cfg_mgw_mgw_keepalive_timeout,
/* 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;