Attention is currently required from: osmith.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/33526 )
Change subject: Cosmetic: fix a typo
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/33526
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: I49f72acc3a42f6c7d50aeffdb1aef312c469d9f3
Gerrit-Change-Number: 33526
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 28 Jun 2023 11:48:05 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/33526 )
Change subject: Cosmetic: fix a typo
......................................................................
Cosmetic: fix a typo
Change-Id: I49f72acc3a42f6c7d50aeffdb1aef312c469d9f3
---
M src/libosmo-mgcp-client/mgcp_client.c
1 file changed, 10 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/26/33526/1
diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c
index 677a4f3..abfecaa 100644
--- a/src/libosmo-mgcp-client/mgcp_client.c
+++ b/src/libosmo-mgcp-client/mgcp_client.c
@@ -148,7 +148,7 @@
* is also ignored and a 1:1 mapping is performed instead. */
/* we may return the codec directly since enum mgcp_codecs directly
- * corresponds to the statićally assigned payload types */
+ * corresponds to the statically assigned payload types */
if (codec < 96 || codec > 127)
return codec;
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/33526
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: I49f72acc3a42f6c7d50aeffdb1aef312c469d9f3
Gerrit-Change-Number: 33526
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
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
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/33467 )
Change subject: mgcp-client: Always mark client as UP if keepalive request-interval disabled
......................................................................
mgcp-client: Always mark client as UP if keepalive request-interval disabled
In the previous logic, if "keepalive request-interval" was disabled
(value 0, default), then if the client was configured to send a DLCX on
startup it would end up in state UP or DOWN depending on whether the MGW
answered to that request.
As a result, an MGW that wouldn't answer would be left forever in DOWN
state since it would have been selected no more and there would be a
keepalive configured to re-mark it as UP.
Fixes: 563386e8bbf0bc6d9050d87f79208d6784e219cf
Related: SYS#6481
Change-Id: I290f7436f48418ee25179951359c76208796e279
---
M src/libosmo-mgcp-client/mgcp_client.c
1 file changed, 25 insertions(+), 6 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c
index 677a4f3..b0ccfe7 100644
--- a/src/libosmo-mgcp-client/mgcp_client.c
+++ b/src/libosmo-mgcp-client/mgcp_client.c
@@ -951,16 +951,16 @@
some_dlcx_sent = true;
}
- if (!some_dlcx_sent) {
- if (mgcp->actual.keepalive.req_interval_sec > 0) {
+ if (mgcp->actual.keepalive.req_interval_sec > 0) {
+ if (!some_dlcx_sent) {
/* Attempt an immediate probe to find out if link is UP or DOWN: */
osmo_timer_schedule(&mgcp->keepalive_tx_timer, 0, 0);
- } else {
- /* Assume link is UP by default, so that this MGW can be selected: */
- mgcp->conn_up = true;
}
+ /* else: keepalive_tx_timer was already scheduled (if needed) down in the stack during Tx DLCX above */
+ } else {
+ /* Assume link is UP by default, so that this MGW can be selected: */
+ mgcp->conn_up = true;
}
- /* else: keepalive_tx_timer was already scheduled (if needed) down in the stack during Tx DLCX above */
if (mgcp->actual.keepalive.timeout_sec > 0)
osmo_timer_schedule(&mgcp->keepalive_rx_timer, mgcp->actual.keepalive.timeout_sec, 0);
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/33467
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: I290f7436f48418ee25179951359c76208796e279
Gerrit-Change-Number: 33467
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
Attention is currently required from: pespin, dexter.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33522 )
Change subject: pcu_sock: use PCUIF version 11 (direct TLLI)
......................................................................
Patch Set 1:
(1 comment)
File src/common/pcu_sock.c:
https://gerrit.osmocom.org/c/osmo-bts/+/33522/comment/a10194e5_a011f0cd
PS1, Line 635: pcu_prim->u.data_cnf_dt = (struct gsm_pcu_if_data_cnf_dt) {
> > iiuc this makes osmo-bts defacto only use the new SAPI, and hence only work properly against an os […]
FYI: older osmo-pcu not supporting PCUIFv11 would immediately abort the PCUIF socket connection seeing a PCUIF version greater than its own.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33522
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I25816ac12e63cc6b641eb414e6bc7eaa9c85fc25
Gerrit-Change-Number: 33522
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 28 Jun 2023 11:03:39 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: pespin, dexter.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33522 )
Change subject: pcu_sock: use PCUIF version 11 (direct TLLI)
......................................................................
Patch Set 1:
(1 comment)
File src/common/pcu_sock.c:
https://gerrit.osmocom.org/c/osmo-bts/+/33522/comment/70aad5e5_eb5edbe2
PS1, Line 635: pcu_prim->u.data_cnf_dt = (struct gsm_pcu_if_data_cnf_dt) {
> iiuc this makes osmo-bts defacto only use the new SAPI, and hence only work properly against an osmo-pcu using/supporting PCUIF 11.
This has always been the case when bumping the PCUIF protocol version.
> IMHO, osmo-bts should store info on which SAPI was used to send the PDH_DATA.req and then use thew old or new SAPI based on that, to stay compatible against older osmo-pcu.
IMO, this is unnecessary complication. I would even go for removing the old TLLI-less messages/structures completely and having only the PCUIFv11 stuff in osmo-bts.git, while keeping backwards compatibility in osmo-pcu.git. It's the first time we're aiming to stay backwards compatible, and see how many weeks it's already taking too finish this. Let's avoid complicating/delaying it even further.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33522
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I25816ac12e63cc6b641eb414e6bc7eaa9c85fc25
Gerrit-Change-Number: 33522
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 28 Jun 2023 11:01:34 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
