pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41091?usp=email )
Change subject: m3ua: Forward SCON messages in SG role
......................................................................
m3ua: Forward SCON messages in SG role
The rx handler for SG role was missing to call the already existing code
to propagate state of congestion state towards ASP peers.
Spec references to the feature are added in place in the code.
Change-Id: Ic68345688d39f5430c30e156b94b1501d77e388c
---
M src/m3ua.c
M src/xua_snm.c
2 files changed, 25 insertions(+), 4 deletions(-)
Approvals:
pespin: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/m3ua.c b/src/m3ua.c
index 4af17a9..8c30775 100644
--- a/src/m3ua.c
+++ b/src/m3ua.c
@@ -1058,15 +1058,32 @@
* xua is owned by parent call m3ua_rx_snm() */
static int m3ua_rx_snm_sg(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_DAUD: /* Audit: ASP inquires about availability of Point Codes */
+ 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."
+ * RFC4666 3.4.4: The SCON message MAY also be sent from the M3UA layer of an ASP
+ * to an M3UA peer, indicating that the congestion level of the M3UA layer or the
+ * ASP has changed.*/
+ 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;
+ case M3UA_SNM_DAUD:
+ /* Audit: ASP inquires about availability of Point Codes */
xua_snm_rx_daud(asp, xua);
break;
default:
return M3UA_ERR_UNSUPP_MSG_TYPE;
}
- return 0;
+ return rc;
}
/* received SNM message
diff --git a/src/xua_snm.c b/src/xua_snm.c
index eda03c9..344cc63 100644
--- a/src/xua_snm.c
+++ b/src/xua_snm.c
@@ -339,9 +339,13 @@
uint32_t rctx[OSMO_SS7_MAX_RCTX_COUNT];
unsigned int num_rctx;
- /* TODO: How to translate to MTP and towards SCCP (create N-PCSTATE.ind to SCU) */
+ /* TODO: Translate to MTP-STATUS.ind towards SCCP (will create N-PCSTATE.ind to SCU) */
- /* inform remote ASPs via SCON */
+ /* RFC4666 1.4.6: "When an SG receives a congestion message (SCON) from an ASP and the SG
+ * determines that an SPMC is now encountering congestion, it MAY trigger SS7 MTP3 Transfer
+ * Controlled management messages to concerned SS7 destinations according to congestion
+ * procedures of the relevant MTP3 standard."
+ * ie. inform remote ASPs via SCON: */
llist_for_each_entry(asp, &s7i->asp_list, list) {
/* SSNM is only permitted for ASPs in ACTIVE state */
if (!osmo_ss7_asp_active(asp))
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41091?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: master
Gerrit-Change-Id: Ic68345688d39f5430c30e156b94b1501d77e388c
Gerrit-Change-Number: 41091
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>
Attention is currently required from: daniel, fixeria, laforge, pespin.
Hello Jenkins Builder, daniel, fixeria, laforge,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/libosmo-sigtran/+/41090?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Code-Review+1 by fixeria, Code-Review+1 by laforge, Code-Review+2 by pespin, Verified+1 by Jenkins Builder
The change is no longer submittable: Code-Review and Verified are unsatisfied now.
Change subject: m3ua: Fix memleak in m3ua_rx_snm_sg() and some paths of m3ua_rx_snm()
......................................................................
m3ua: Fix memleak in m3ua_rx_snm_sg() and some paths of m3ua_rx_snm()
Own and free the xua msg in the main m3ua_rx_snm*() as done for other
message types.
Change-Id: Iab795da63e65d9539a44c985d9ca85aa76d203c6
---
M src/m3ua.c
1 file changed, 23 insertions(+), 11 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/90/41090/2
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41090?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: master
Gerrit-Change-Id: Iab795da63e65d9539a44c985d9ca85aa76d203c6
Gerrit-Change-Number: 41090
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
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-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>
Attention is currently required from: fixeria, laforge.
Hello Jenkins Builder, fixeria, laforge,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/libosmo-sigtran/+/41091?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Code-Review+1 by fixeria, Code-Review+1 by laforge, Verified+1 by Jenkins Builder
Change subject: m3ua: Forward SCON messages in SG role
......................................................................
m3ua: Forward SCON messages in SG role
The rx handler for SG role was missing to call the already existing code
to propagate state of congestion state towards ASP peers.
Spec references to the feature are added in place in the code.
Change-Id: Ic68345688d39f5430c30e156b94b1501d77e388c
---
M src/m3ua.c
M src/xua_snm.c
2 files changed, 25 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/91/41091/2
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41091?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: master
Gerrit-Change-Id: Ic68345688d39f5430c30e156b94b1501d77e388c
Gerrit-Change-Number: 41091
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-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Attention is currently required from: fixeria, laforge.
Hello Jenkins Builder, fixeria, laforge,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/libosmo-sigtran/+/41092?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Code-Review+1 by fixeria, Code-Review+1 by laforge, Verified+1 by Jenkins Builder
Change subject: Propagate rx M3UA SCON -> MTP-STATUS.ind -> N-PCSTATE.ind
......................................................................
Propagate rx M3UA SCON -> MTP-STATUS.ind -> N-PCSTATE.ind
Change-Id: I82541612c039b1cc0191cb44d2eecdcbb07fae96
---
M include/osmocom/sigtran/protocol/mtp.h
M src/sccp_internal.h
M src/sccp_scmg.c
M src/xua_snm.c
4 files changed, 74 insertions(+), 17 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/92/41092/2
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41092?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: master
Gerrit-Change-Id: I82541612c039b1cc0191cb44d2eecdcbb07fae96
Gerrit-Change-Number: 41092
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-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>