pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29645 )
Change subject: osmux: Set conn->type during osmux_init_conn()
......................................................................
osmux: Set conn->type during osmux_init_conn()
It's basically the same code path (one function calls the other), but it
makes a lot more sense to have it in the init function itself.
Change-Id: I63d7dfff451870f708f7cb710d66f4ec786c27d7
---
M src/libosmo-mgcp/mgcp_osmux.c
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c
index f820276..cd45a87 100644
--- a/src/libosmo-mgcp/mgcp_osmux.c
+++ b/src/libosmo-mgcp/mgcp_osmux.c
@@ -494,6 +494,7 @@
return -1;
conn->osmux.ctrg = rate_ctr_group_alloc(conn->conn, &rate_ctr_group_osmux_desc, conn->ctrg->idx);
+ conn->type = MGCP_RTP_OSMUX;
conn->osmux.state = OSMUX_STATE_ACTIVATING;
return 0;
}
@@ -614,7 +615,6 @@
conn->osmux.local_cid = (uint8_t) osmux_cid;
conn->osmux.local_cid_allocated = true;
- conn->type = MGCP_RTP_OSMUX;
return osmux_cid;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29645
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: I63d7dfff451870f708f7cb710d66f4ec786c27d7
Gerrit-Change-Number: 29645
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29643 )
Change subject: Check once if remote addr is available when sending dummy packet
......................................................................
Check once if remote addr is available when sending dummy packet
It's checked in all code paths being called, which makes sense since
it's impossible to send anything if the remote address is not set. Let's
check it once in a unique to simplify the code.
Change-Id: I224dbfeda17c364b85166268e2ac1e019a87edb6
---
M src/libosmo-mgcp/mgcp_osmux.c
M src/libosmo-mgcp/mgcp_protocol.c
2 files changed, 6 insertions(+), 7 deletions(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
laforge: Looks good to me, but someone else must approve
diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c
index d9a10a9..ebb41a6 100644
--- a/src/libosmo-mgcp/mgcp_osmux.c
+++ b/src/libosmo-mgcp/mgcp_osmux.c
@@ -645,9 +645,6 @@
* endpoint may have already punched the hole in the firewall. This
* approach is simple though. */
- /* Wait until we have the connection information from MDCX */
- if (!mgcp_rtp_end_remote_addr_available(&conn->end))
- return 0;
if (endp_osmux_state_check(endp, conn, true) < 0)
return 0;
diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c
index 1d286ed..b4a4792 100644
--- a/src/libosmo-mgcp/mgcp_protocol.c
+++ b/src/libosmo-mgcp/mgcp_protocol.c
@@ -324,6 +324,11 @@
* osmux connection, send the dummy packet via OSMUX */
static void send_dummy(struct mgcp_endpoint *endp, struct mgcp_conn_rtp *conn)
{
+ /* Avoid sending dummy packet if the remote address was not yet
+ * configured through CRCX/MDCX: */
+ if (!mgcp_rtp_end_remote_addr_available(&conn->end))
+ return;
+
if (mgcp_conn_rtp_is_osmux(conn))
osmux_send_dummy(endp, conn);
else
@@ -1090,7 +1095,6 @@
/* Send dummy packet, see also comments in mgcp_keepalive_timer_cb() */
OSMO_ASSERT(trunk->keepalive_interval >= MGCP_KEEPALIVE_ONCE);
if (conn->conn->mode & MGCP_CONN_RECV_ONLY &&
- mgcp_rtp_end_remote_addr_available(&conn->end) &&
trunk->keepalive_interval != MGCP_KEEPALIVE_NEVER)
send_dummy(endp, conn);
@@ -1310,7 +1314,6 @@
/* Send dummy packet, see also comments in mgcp_keepalive_timer_cb() */
OSMO_ASSERT(trunk->keepalive_interval >= MGCP_KEEPALIVE_ONCE);
if (conn->conn->mode & MGCP_CONN_RECV_ONLY &&
- mgcp_rtp_end_remote_addr_available(&conn->end) &&
trunk->keepalive_interval != MGCP_KEEPALIVE_NEVER)
send_dummy(endp, conn);
@@ -1579,8 +1582,7 @@
struct mgcp_endpoint *endp = trunk->endpoints[i];
llist_for_each_entry(conn, &endp->conns, entry) {
if (conn->type == MGCP_CONN_TYPE_RTP &&
- conn->mode == MGCP_CONN_RECV_ONLY &&
- mgcp_rtp_end_remote_addr_available(&conn->u.rtp.end))
+ conn->mode == MGCP_CONN_RECV_ONLY)
send_dummy(endp, &conn->u.rtp);
}
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29643
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: I224dbfeda17c364b85166268e2ac1e019a87edb6
Gerrit-Change-Number: 29643
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: fixeria.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29643 )
Change subject: Check once if remote addr is available when sending dummy packet
......................................................................
Patch Set 2: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29643
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: I224dbfeda17c364b85166268e2ac1e019a87edb6
Gerrit-Change-Number: 29643
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 10 Oct 2022 21:36:26 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29683 )
Change subject: tests/rlcmac/ts_44_018_test: do not depend on libosmogsm
......................................................................
tests/rlcmac/ts_44_018_test: do not depend on libosmogsm
Header file <osmocom/gsm/protocol/gsm_04_08.h> belongs to libosmogsm.
However, file 'contrib/libosmo-gprs.spec.in' does not list this lib
as a build dependency. So building the RPM package currently fails.
We could have listed libosmogsm as 'BuildRequires', but given that
the only thing we use from this lib is the GSM_MACBLOCK_LEN macro,
there is no real need to depend on it.
Change-Id: Ieac350e7a05965c64e8ccf8dd17a569f0afd9514
---
M tests/rlcmac/ts_44_018_test.c
1 file changed, 1 insertion(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/83/29683/1
diff --git a/tests/rlcmac/ts_44_018_test.c b/tests/rlcmac/ts_44_018_test.c
index dd6f4f7..d1cc170 100644
--- a/tests/rlcmac/ts_44_018_test.c
+++ b/tests/rlcmac/ts_44_018_test.c
@@ -23,7 +23,6 @@
#include <osmocom/core/msgb.h>
#include <osmocom/csn1/csn1.h>
-#include <osmocom/gsm/protocol/gsm_04_08.h>
#include <osmocom/gprs/rlcmac/gprs_rlcmac.h>
static void *tall_ctx = NULL;
@@ -41,7 +40,7 @@
};
for (unsigned int i = 0; i < ARRAY_SIZE(testData); i++) {
- uint8_t buf[GSM_MACBLOCK_LEN - 3];
+ uint8_t buf[20]; /* GSM_MACBLOCK_LEN - 3 */
SI_13_t si13ro = { 0 };
int rc;
--
To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29683
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-gprs
Gerrit-Branch: master
Gerrit-Change-Id: Ieac350e7a05965c64e8ccf8dd17a569f0afd9514
Gerrit-Change-Number: 29683
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: msuraev.
keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/29675 )
Change subject: SNDCP: log more details on failure
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/29675
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: Iad3ebbc28909a827db7b3a0ae2d3e1de7991210f
Gerrit-Change-Number: 29675
Gerrit-PatchSet: 1
Gerrit-Owner: msuraev <msuraev(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: keith <keith(a)rhizomatica.org>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: msuraev <msuraev(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 10 Oct 2022 14:31:32 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: msuraev.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/29677 )
Change subject: GTP: migrate from deprecated function
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/29677
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I8b46cf8c52e36b0312eddf37f3e136662b95732e
Gerrit-Change-Number: 29677
Gerrit-PatchSet: 1
Gerrit-Owner: msuraev <msuraev(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: msuraev <msuraev(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 10 Oct 2022 14:27:56 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: keith, msuraev.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/29676 )
Change subject: GMM: permit E_GMM_COMMON_PROC_SUCCESS in normal state
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/29676
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: Ia97b50aac6c665812ddca9010de7f97b17b78bd5
Gerrit-Change-Number: 29676
Gerrit-PatchSet: 1
Gerrit-Owner: msuraev <msuraev(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: keith <keith(a)rhizomatica.org>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: keith <keith(a)rhizomatica.org>
Gerrit-Attention: msuraev <msuraev(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 10 Oct 2022 14:27:43 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment