pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42029?usp=email )
Change subject: m3ua: Allow rx SCON in IPSP role
......................................................................
m3ua: Allow rx SCON in IPSP role
Change-Id: I49838219aab912243a761ab9b5167095e363c72b
---
M src/m3ua.c
1 file changed, 29 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/29/42029/1
diff --git a/src/m3ua.c b/src/m3ua.c
index f2844fa..afe75de 100644
--- a/src/m3ua.c
+++ b/src/m3ua.c
@@ -1107,6 +1107,34 @@
return rc;
}
+/* received SNM message on IPSP side
+ * xua is owned by parent call m3ua_rx_snm() */
+static int m3ua_rx_snm_ipsp(struct osmo_ss7_asp *asp, struct xua_msg *xua)
+{
+ struct osmo_ss7_as *as = NULL;
+ struct xua_msg_part *rctx_ie;
+ int rc = 0;
+
+ switch (xua->hdr.msg_type) {
+ case M3UA_SNM_SCON:
+ /* RFC4666 1.4.6: "The M3UA layer at an ASP or IPSP MAY indicate local congestion
+ * to an M3UA peer with an SCON message."
+ * An IPSP can only be connected against another IPSP, hence if an IPSP can send
+ * an SCON, it can be derived that it is expected it can receive it: */
+ rctx_ie = xua_msg_find_tag(xua, M3UA_IEI_ROUTE_CTX);
+ rc = xua_find_as_for_asp(&as, asp, rctx_ie);
+ if (rc)
+ return rc;
+ xua_snm_rx_scon(asp, as, xua);
+ break;
+ default:
+ /* RFC 4666 Section 1.5.2: there is no MTP3 network management status information */
+ return M3UA_ERR_UNSUPP_MSG_TYPE;
+ }
+
+ return rc;
+}
+
/* received SNM message
* This function takes ownership of xua msg passed to it. */
static int m3ua_rx_snm(struct osmo_ss7_asp *asp, struct xua_msg *xua)
@@ -1150,7 +1178,7 @@
rc = m3ua_rx_snm_asp(asp, xua);
break;
case OSMO_SS7_ASP_ROLE_IPSP:
- /* RFC 4666 Section 1.5.2: there is no MTP3 network management status information */
+ rc = m3ua_rx_snm_ipsp(asp, xua);
default:
rc = M3UA_ERR_UNSUPP_MSG_CLASS;
break;
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42029?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: master
Gerrit-Change-Id: I49838219aab912243a761ab9b5167095e363c72b
Gerrit-Change-Number: 42029
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42030?usp=email )
Change subject: cosmetic: xua_as_fsm.c: Improve spec documentation
......................................................................
cosmetic: xua_as_fsm.c: Improve spec documentation
The specific spec paragraph talks about "Alternate ASP_Active"
scenario in quotes, which I could find right away by grepping
in the code. Improve the documentation so it can be easily matched in
code.
Change-Id: I79f5123d87dab79620657c2a2ebfd9fe22f178c3
---
M src/xua_as_fsm.c
1 file changed, 5 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/30/42030/1
diff --git a/src/xua_as_fsm.c b/src/xua_as_fsm.c
index fd44e70..092db55 100644
--- a/src/xua_as_fsm.c
+++ b/src/xua_as_fsm.c
@@ -310,8 +310,10 @@
return false;
}
-/* Tell other previously-active ASPs that a new ASP has been activated and mark
- them as inactive. Used in override mode when an ASP becomes active. */
+/* RFC4666 4.3.4.3 "Alternate ASP_Active":
+ * Tell other previously-active ASPs that a new ASP has been activated and mark
+ * them as inactive. Used in override mode when an ASP becomes active."
+ * */
static void notify_any_other_active_asp_as_inactive(struct osmo_ss7_as *as, struct osmo_ss7_asp *asp_cmp)
{
unsigned int i;
@@ -612,7 +614,7 @@
break;
case XUA_ASPAS_ASP_ACTIVE_IND:
asp = data;
- /* RFC466 sec 4.3.4.3 ASP Active Procedures*/
+ /* RFC466 sec 4.3.4.3 ASP Active Procedures */
if (xafp->as->cfg.mode == OSMO_SS7_AS_TMOD_OVERRIDE)
notify_any_other_active_asp_as_inactive(xafp->as, asp);
/* SG role: No need to send DUNA for unknown destinations here
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42030?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: master
Gerrit-Change-Id: I79f5123d87dab79620657c2a2ebfd9fe22f178c3
Gerrit-Change-Number: 42030
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42025?usp=email )
Change subject: IPSP: don't route any incoming M3UA messages in IPSP case
......................................................................
IPSP: don't route any incoming M3UA messages in IPSP case
An IPSP is a point-to-point association, and we must not route any
such messages.
Change-Id: Iad7280619ec5814cda7a179418079048a5955976
---
M src/m3ua.c
1 file changed, 8 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/25/42025/1
diff --git a/src/m3ua.c b/src/m3ua.c
index e4173bd..a3235d6 100644
--- a/src/m3ua.c
+++ b/src/m3ua.c
@@ -41,6 +41,7 @@
#include <osmocom/sigtran/protocol/sua.h>
#include "mtp3_hmdc.h"
+#include "mtp3_hmdt.h"
#include "xua_as_fsm.h"
#include "xua_asp_fsm.h"
#include "xua_internal.h"
@@ -667,8 +668,14 @@
xua_msg_free_tag(xua, M3UA_IEI_ROUTE_CTX);
}
+ /* an IPSP by definition is a peer-to-peer service that doesn't
+ * use a signaling gateway, and hence doesn't route messages.
+ * See RFC 4666 Section 1.4.3.4. */
/* xua ownership is passed here: */
- return mtp3_hmdc_rx_from_l2(asp->inst, xua);
+ if (asp->cfg.role == OSMO_SS7_ASP_ROLE_IPSP)
+ return mtp3_hmdt_message_for_distribution(asp->inst, xua);
+ else
+ return mtp3_hmdc_rx_from_l2(asp->inst, xua);
ret_free:
xua_msg_free(xua);
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42025?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: master
Gerrit-Change-Id: Iad7280619ec5814cda7a179418079048a5955976
Gerrit-Change-Number: 42025
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42026?usp=email )
Change subject: IPSP: Add a comment that it's intentional to drop all M3UA SNM for IPSP
......................................................................
IPSP: Add a comment that it's intentional to drop all M3UA SNM for IPSP
An IPSP doesn't have MTP3 network management.
Change-Id: I7b87bf03964e7e9aac683ad860e511f83a685821
---
M src/m3ua.c
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/26/42026/1
diff --git a/src/m3ua.c b/src/m3ua.c
index a3235d6..f2844fa 100644
--- a/src/m3ua.c
+++ b/src/m3ua.c
@@ -1149,6 +1149,8 @@
case OSMO_SS7_ASP_ROLE_ASP:
rc = m3ua_rx_snm_asp(asp, xua);
break;
+ case OSMO_SS7_ASP_ROLE_IPSP:
+ /* RFC 4666 Section 1.5.2: there is no MTP3 network management status information */
default:
rc = M3UA_ERR_UNSUPP_MSG_CLASS;
break;
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42026?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: master
Gerrit-Change-Id: I7b87bf03964e7e9aac683ad860e511f83a685821
Gerrit-Change-Number: 42026
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/42017?usp=email )
Change subject: tests/db_upgrade: Use log stderr blocking-io
......................................................................
tests/db_upgrade: Use log stderr blocking-io
When --db-check is used, osmo-hlr actually becomes a synchronous
non-interactive program instead of a daemon.
In that case, we want to use blocking-io since it doesn't use the event
loop, so we want to flush all logging synchrnously before exiting.
Change-Id: Ic81eacbcc0432b81debc52c49fddc668c7a062b3
---
M tests/db_upgrade/osmo-hlr.cfg
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
pespin: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/tests/db_upgrade/osmo-hlr.cfg b/tests/db_upgrade/osmo-hlr.cfg
index 7fb12c1..9f5ce42 100644
--- a/tests/db_upgrade/osmo-hlr.cfg
+++ b/tests/db_upgrade/osmo-hlr.cfg
@@ -1,4 +1,4 @@
-log stderr
+log stderr blocking-io
logging level db notice
logging print category-hex 0
logging print file 0
--
To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/42017?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-hlr
Gerrit-Branch: master
Gerrit-Change-Id: Ic81eacbcc0432b81debc52c49fddc668c7a062b3
Gerrit-Change-Number: 42017
Gerrit-PatchSet: 1
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>
Attention is currently required from: laforge.
pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hlr/+/42017?usp=email )
Change subject: tests/db_upgrade: Use log stderr blocking-io
......................................................................
Patch Set 1: Code-Review+2
(1 comment)
Patchset:
PS1:
Merging this patch in order to avoid another day of nightly repo breakage...
--
To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/42017?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-hlr
Gerrit-Branch: master
Gerrit-Change-Id: Ic81eacbcc0432b81debc52c49fddc668c7a062b3
Gerrit-Change-Number: 42017
Gerrit-PatchSet: 1
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-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Tue, 03 Feb 2026 16:06:44 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Attention is currently required from: pespin.
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42024?usp=email
to look at the new patch set (#4).
The following approvals got outdated and were removed:
Verified-1 by Jenkins Builder
Change subject: RAN_Emulation: Assume SCCP peer available if rx BSSAP/RANAP Reset
......................................................................
RAN_Emulation: Assume SCCP peer available if rx BSSAP/RANAP Reset
This way we speed up tests, and also avoid extra verbosity by avoiding
receiving and transmitting extra RESET.
Change-Id: Id9020320b61d89720e17e1024b629f0227445266
---
M bsc/BSC_Tests.ttcn
M library/RAN_Emulation.ttcnpp
M msc/MSC_Tests.ttcn
3 files changed, 58 insertions(+), 11 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/24/42024/4
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42024?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Id9020320b61d89720e17e1024b629f0227445266
Gerrit-Change-Number: 42024
Gerrit-PatchSet: 4
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Attention is currently required from: pespin.
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42024?usp=email
to look at the new patch set (#3).
Change subject: RAN_Emulation: Assume SCCP peer available if rx BSSAP/RANAP Reset
......................................................................
RAN_Emulation: Assume SCCP peer available if rx BSSAP/RANAP Reset
This way we speed up tests, and also avoid extra verbosity by avoiding
receiving and transmitting extra RESET.
Change-Id: Id9020320b61d89720e17e1024b629f0227445266
---
M bsc/BSC_Tests.ttcn
M library/RAN_Emulation.ttcnpp
2 files changed, 55 insertions(+), 10 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/24/42024/3
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42024?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Id9020320b61d89720e17e1024b629f0227445266
Gerrit-Change-Number: 42024
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Attention: pespin <pespin(a)sysmocom.de>