Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-sip-connector/+/29560
to look at the new patch set (#2).
Change subject: Set MNCC_F_GCR field when the gcr is present
......................................................................
Set MNCC_F_GCR field when the gcr is present
Commit bd66804082bf813a1f925c6af4df28fd664ac1de established that the
MNCC field flag MNCC_F_GCR should be set when the GCR is present,
but did not set it.
Change-Id: Idad3210055a0d25be6220301b965e3d4c7323692
---
M src/mncc.c
1 file changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/60/29560/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/29560
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sip-connector
Gerrit-Branch: master
Gerrit-Change-Id: Idad3210055a0d25be6220301b965e3d4c7323692
Gerrit-Change-Number: 29560
Gerrit-PatchSet: 2
Gerrit-Owner: keith <keith(a)rhizomatica.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-MessageType: newpatchset
keith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/29560 )
Change subject: Set MNCC_F_GCR field when the gcr is present
......................................................................
Set MNCC_F_GCR field when the gcr is present
Commit bd66804082bf813a1f925c6af4df28fd664ac1de established that the
MNCC field flag MNCC_F_GCR should be set when the GCR is present,
but did not set it.
Change-Id: Idad3210055a0d25be6220301b965e3d4c7323692
---
M src/mncc.c
1 file changed, 5 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/60/29560/1
diff --git a/src/mncc.c b/src/mncc.c
index f302b3e..ddc1ae6 100644
--- a/src/mncc.c
+++ b/src/mncc.c
@@ -936,10 +936,13 @@
/* Encode the Global Call Reference (if present) */
if (call->gcr_present) {
msg = msgb_alloc(sizeof(mncc.gcr), "MNCC GCR");
- if (msg == NULL || (rc = osmo_enc_gcr(msg, &call->gcr)) == 0)
+ if (msg == NULL || (rc = osmo_enc_gcr(msg, &call->gcr)) == 0) {
LOGP(DMNCC, LOGL_ERROR, "MNCC leg(%u) failed to encode GCR\n", call->id);
- else
+ } else {
memcpy(&mncc.gcr[0], msg->data, rc);
+ mncc.fields |= MNCC_F_GCR;
+ }
+
msgb_free(msg);
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/29560
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sip-connector
Gerrit-Branch: master
Gerrit-Change-Id: Idad3210055a0d25be6220301b965e3d4c7323692
Gerrit-Change-Number: 29560
Gerrit-PatchSet: 1
Gerrit-Owner: keith <keith(a)rhizomatica.org>
Gerrit-MessageType: newchange
keith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/29559 )
Change subject: Update MNCC field validation mask.
......................................................................
Update MNCC field validation mask.
In c6921e5068ba62cde67707fb3c8103919d1e0c0e, 0x4000 was added to the
possible MNCC field flags, but before this commit, using it would
result in an ERROR of "Unknown MNCC field mask 0x....."
Related: #OS5282
Change-Id: I9e7d224e7f2d6d2824b2466752b6e8c994ac5a3d
---
M src/libmsc/mncc.c
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/59/29559/1
diff --git a/src/libmsc/mncc.c b/src/libmsc/mncc.c
index 0a38997..f446f98 100644
--- a/src/libmsc/mncc.c
+++ b/src/libmsc/mncc.c
@@ -110,7 +110,7 @@
* MNCC validation code. Move to libosmocore once headers are merged
************************************************************************/
-#define MNCC_F_ALL 0x3fff
+#define MNCC_F_ALL 0x7fff
static int check_string_terminated(const char *str, unsigned int size)
{
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/29559
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I9e7d224e7f2d6d2824b2466752b6e8c994ac5a3d
Gerrit-Change-Number: 29559
Gerrit-PatchSet: 1
Gerrit-Owner: keith <keith(a)rhizomatica.org>
Gerrit-MessageType: newchange
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/29547 )
Change subject: Close conn when receiving SCTP_ASSOC_CHANGE notification
......................................................................
Close conn when receiving SCTP_ASSOC_CHANGE notification
It was seen on a real pcap trace (sctp & gsmtap_log) that the kernel
stack may decide to kill the connection (sending an ABORT) if it fails
to transmit some data after a while:
ABORT Cause code: "Protocol violation (0x000d)",
Cause Information: "Association exceeded its max_retrans count".
When this occurs, the kernel sends the
MSG_NOTIFICATION,SCTP_ASSOC_CHANGE,SCTP_COMM_LOST notification when
reading from the socket with sctp_recvmsg(). This basically signals that
the socket conn is dead, and subsequent writes to it will result in
send() failures (and receive SCTP_SEND_FAILED notification upon follow
up reads).
It's important to notice that after those events, there's no other sort
of different event like SHUTDOWN coming in, so that's the time at which
we must tell the user to close the socket.
Hence, let's signal the caller that the socket is dead by returning 0,
to comply with usual recv() API.
Related: SYS#6113
Change-Id: If35efd404405f926a4a6cc45862eeadd1b04e08c
---
M src/osmo-hnbgw/hnbgw.c
1 file changed, 7 insertions(+), 0 deletions(-)
Approvals:
pespin: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c
index 0c59c7d..dd0999c 100644
--- a/src/osmo-hnbgw/hnbgw.c
+++ b/src/osmo-hnbgw/hnbgw.c
@@ -258,6 +258,13 @@
switch (notif->sn_header.sn_type) {
case SCTP_ASSOC_CHANGE:
switch (notif->sn_assoc_change.sac_state) {
+ case SCTP_COMM_LOST:
+ LOGHNB(hnb, DMAIN, LOGL_NOTICE,
+ "sctp_recvmsg(%s) = SCTP_COMM_LOST, closing conn\n",
+ osmo_sock_get_name2(osmo_stream_srv_get_ofd(conn)->fd));
+ osmo_stream_srv_destroy(conn);
+ rc = -1;
+ break;
case SCTP_RESTART:
LOGHNB(hnb, DMAIN, LOGL_NOTICE, "HNB SCTP conn RESTARTed, marking as HNBAP-unregistered\n");
hnb->hnb_registered = false;
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/29547
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: If35efd404405f926a4a6cc45862eeadd1b04e08c
Gerrit-Change-Number: 29547
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: pespin <pespin(a)sysmocom.de>
Gerrit-CC: neels <nhofmeyr(a)sysmocom.de>
Gerrit-MessageType: merged