Attention is currently required from: dexter.
pespin has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39657?usp=email )
Change subject: HTTP_Adapter: allow requests to different hosts
......................................................................
Patch Set 2: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39657?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ic87674f2381b3c6a1be6d0ce28a9e5403cda201b
Gerrit-Change-Number: 39657
Gerrit-PatchSet: 2
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 05 Mar 2025 11:28:48 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Attention is currently required from: laforge.
pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39690?usp=email )
Change subject: sccp: Allow marking UNIT-DATA.req Sequence Control param non-presence, set SLS
......................................................................
Patch Set 2:
(1 comment)
File src/sccp_sclc.c:
https://gerrit.osmocom.org/c/libosmo-sigtran/+/39690/comment/4d960e8c_5e302… :
PS2, Line 38: *
> I'm not quite sure if the SLS setting is all that's needed for class 3 support? Are we sure about th […]
@laforge@gnumonks.org I removed those from here because theycare not really related to this file. class 2 and 3 are for connection-oriented, and this file is for connectionless (class 0 and 1). I bet this was simply a copy-paste error when creating the file or adding the header.
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39690?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: master
Gerrit-Change-Id: I834e91c1ec337713b0e684cf4fd7de854150bef6
Gerrit-Change-Number: 39690
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Wed, 05 Mar 2025 11:24:33 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39674?usp=email )
Change subject: sccp_user: Move lookup to helper function to simplify code
......................................................................
sccp_user: Move lookup to helper function to simplify code
Keep lookup logic separate from already complex function with lots of
logic involved.
Change-Id: Ia2c8f9598e28be747bb3f1a61a1d8b0aa3d267b3
---
M src/sccp_user.c
1 file changed, 15 insertions(+), 10 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
diff --git a/src/sccp_user.c b/src/sccp_user.c
index cada057..d60d66a 100644
--- a/src/sccp_user.c
+++ b/src/sccp_user.c
@@ -491,6 +491,18 @@
* Convenience function for CLIENT
***********************************************************************/
+ /* Returns whether AS is already associated to any AS.
+ * Helper function for osmo_sccp_simple_client_on_ss7_id(). */
+static bool asp_serves_some_as(const struct osmo_ss7_asp *asp)
+{
+ struct osmo_ss7_as *as_i;
+ llist_for_each_entry(as_i, &asp->inst->as_list, list) {
+ if (osmo_ss7_as_has_asp(as_i, asp))
+ return true;
+ }
+ return false;
+}
+
/*! \brief request an sccp client instance
* \param[in] ctx talloc context
* \param[in] ss7_id of the SS7/CS7 instance
@@ -610,18 +622,11 @@
/* Check if the user has created an ASP for this proto that is not added on any AS yet. */
struct osmo_ss7_asp *asp_i;
llist_for_each_entry(asp_i, &ss7->asp_list, list) {
- struct osmo_ss7_as *as_i;
- bool is_on_as = false;
if (asp_i->cfg.proto != prot)
continue;
- llist_for_each_entry(as_i, &ss7->as_list, list) {
- if (!osmo_ss7_as_has_asp(as_i, asp_i))
- continue;
- is_on_as = true;
- break;
- }
- if (is_on_as) {
- /* This ASP is already on another AS. If it was on this AS, we'd have found it above. */
+ if (asp_serves_some_as(asp_i)) {
+ /* This ASP is already on another AS.
+ * If it was on this AS, we'd have found it above. */
continue;
}
/* This ASP matches the protocol and is not yet associated to any AS. Use it. */
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39674?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: Ia2c8f9598e28be747bb3f1a61a1d8b0aa3d267b3
Gerrit-Change-Number: 39674
Gerrit-PatchSet: 1
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: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39675?usp=email )
Change subject: as: Introduce internal ss7_as_add_asp() to avoid unnecessary asp lookup
......................................................................
as: Introduce internal ss7_as_add_asp() to avoid unnecessary asp lookup
Change-Id: Id75fde04e39747fd3a7a1b169f7b925e5a8064d9
---
M src/osmo_ss7_as.c
M src/sccp_user.c
M src/ss7_as.h
M src/xua_asp_fsm.c
M src/xua_rkm.c
5 files changed, 26 insertions(+), 14 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/osmo_ss7_as.c b/src/osmo_ss7_as.c
index ab48ca8..6aadb8f 100644
--- a/src/osmo_ss7_as.c
+++ b/src/osmo_ss7_as.c
@@ -110,21 +110,16 @@
* \param[in] as Application Server to which \ref asp is added
* \param[in] asp Application Server Process to be added to \ref as
* \returns 0 on success; negative in case of error */
-int osmo_ss7_as_add_asp(struct osmo_ss7_as *as, const char *asp_name)
+int ss7_as_add_asp(struct osmo_ss7_as *as, struct osmo_ss7_asp *asp)
{
- struct osmo_ss7_asp *asp;
unsigned int i;
-
- OSMO_ASSERT(ss7_initialized);
- asp = osmo_ss7_asp_find_by_name(as->inst, asp_name);
- if (!asp)
- return -ENODEV;
-
- LOGPAS(as, DLSS7, LOGL_INFO, "Adding ASP %s to AS\n", asp->cfg.name);
+ OSMO_ASSERT(asp);
if (osmo_ss7_as_has_asp(as, asp))
return 0;
+ LOGPAS(as, DLSS7, LOGL_INFO, "Adding ASP %s to AS\n", asp->cfg.name);
+
for (i = 0; i < ARRAY_SIZE(as->cfg.asps); i++) {
if (!as->cfg.asps[i]) {
as->cfg.asps[i] = asp;
@@ -137,6 +132,22 @@
return -ENOSPC;
}
+/*! \brief Add given ASP to given AS
+ * \param[in] as Application Server to which \ref asp is added
+ * \param[in] asp_name Name of Application Server Process to be added to \ref as
+ * \returns 0 on success; negative in case of error */
+int osmo_ss7_as_add_asp(struct osmo_ss7_as *as, const char *asp_name)
+{
+ struct osmo_ss7_asp *asp;
+
+ OSMO_ASSERT(ss7_initialized);
+ asp = osmo_ss7_asp_find_by_name(as->inst, asp_name);
+ if (!asp)
+ return -ENODEV;
+
+ return ss7_as_add_asp(as, asp);
+}
+
/*! \brief Delete given ASP from given AS
* \param[in] as Application Server from which \ref asp is deleted
* \param[in] asp Application Server Process to delete from \ref as
diff --git a/src/sccp_user.c b/src/sccp_user.c
index d60d66a..a32bbaa 100644
--- a/src/sccp_user.c
+++ b/src/sccp_user.c
@@ -633,7 +633,7 @@
asp = asp_i;
LOGP(DLSCCP, LOGL_NOTICE, "%s: ASP %s for %s is not associated with any AS, using it\n",
name, asp->cfg.name, osmo_ss7_asp_protocol_name(prot));
- osmo_ss7_as_add_asp(as, asp->cfg.name);
+ ss7_as_add_asp(as, asp);
break;
}
if (!asp) {
@@ -657,7 +657,7 @@
ss7_asp_peer_set_hosts(&asp->cfg.local, asp, &default_local_ip, 1);
if (default_remote_ip)
ss7_asp_peer_set_hosts(&asp->cfg.remote, asp, &default_remote_ip, 1);
- osmo_ss7_as_add_asp(as, asp->cfg.name);
+ ss7_as_add_asp(as, asp);
/* Make sure proper defaults are applied if app didn't
provide specific default values, then restart the ASP: */
ss7_asp_restart_after_reconfigure(asp);
@@ -866,7 +866,7 @@
goto out_asp;
asp->cfg.is_server = true;
asp->cfg.role = OSMO_SS7_ASP_ROLE_SG;
- osmo_ss7_as_add_asp(as, asp_name);
+ ss7_as_add_asp(as, asp);
talloc_free(asp_name);
talloc_free(as_name);
osmo_ss7_asp_restart(asp);
diff --git a/src/ss7_as.h b/src/ss7_as.h
index 4a7c50d..db7372c 100644
--- a/src/ss7_as.h
+++ b/src/ss7_as.h
@@ -68,6 +68,7 @@
};
unsigned int osmo_ss7_as_count_asp(const struct osmo_ss7_as *as);
+int ss7_as_add_asp(struct osmo_ss7_as *as, struct osmo_ss7_asp *asp);
#define LOGPAS(as, subsys, level, fmt, args ...) \
_LOGSS7((as)->inst, subsys, level, "AS(%s) " fmt, (as)->cfg.name, ## args)
diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c
index 0e39b0d..9ad9dce 100644
--- a/src/xua_asp_fsm.c
+++ b/src/xua_asp_fsm.c
@@ -958,7 +958,7 @@
iafp->ipa_unit->unit_name);
goto out_err;
}
- osmo_ss7_as_add_asp(as, asp->cfg.name);
+ ss7_as_add_asp(as, asp);
/* TODO: OAP Authentication? */
/* Send ID_ACK */
if (fd >= 0) {
diff --git a/src/xua_rkm.c b/src/xua_rkm.c
index 9e77095..98f41c5 100644
--- a/src/xua_rkm.c
+++ b/src/xua_rkm.c
@@ -297,7 +297,7 @@
}
/* Success: Add just-create AS to connected ASP + report success */
- osmo_ss7_as_add_asp(as, asp->cfg.name);
+ ss7_as_add_asp(as, asp);
msgb_append_reg_res(resp, rk_id, M3UA_RKM_REG_SUCCESS, rctx);
/* append to list of newly assigned as */
newly_assigned_as[(*nas_idx)++] = as;
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39675?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: Id75fde04e39747fd3a7a1b169f7b925e5a8064d9
Gerrit-Change-Number: 39675
Gerrit-PatchSet: 1
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: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39676?usp=email )
Change subject: sccp_user: Fix ASP not restarted after associating a new AS to it
......................................................................
sccp_user: Fix ASP not restarted after associating a new AS to it
Recent commit introduced a regression when applying
default_layer_manager to all ASPs in m3ua-mode ASP.
The call to osmo_ss7_asp_restart() was moved to an inner code path but
I failed to figure out the ASP restart is also needed in this code path.
Fixes: ce63d3b2027cefb8412179497100d14ed3fee0dd
Change-Id: I5cccad3347dbea33433028e17571b1c16ecaf719
---
M src/sccp_user.c
1 file changed, 5 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
diff --git a/src/sccp_user.c b/src/sccp_user.c
index a32bbaa..b869dab 100644
--- a/src/sccp_user.c
+++ b/src/sccp_user.c
@@ -634,6 +634,11 @@
LOGP(DLSCCP, LOGL_NOTICE, "%s: ASP %s for %s is not associated with any AS, using it\n",
name, asp->cfg.name, osmo_ss7_asp_protocol_name(prot));
ss7_as_add_asp(as, asp);
+ /* ASP became associated to a new AS, hence it needs to be
+ * restarted to announce/register its Routing Context.
+ * Make sure proper defaults are applied if app didn't
+ * provide specific default values, then restart the ASP: */
+ ss7_asp_restart_after_reconfigure(asp);
break;
}
if (!asp) {
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39676?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: I5cccad3347dbea33433028e17571b1c16ecaf719
Gerrit-Change-Number: 39676
Gerrit-PatchSet: 1
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: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Attention is currently required from: fixeria, laforge.
Hello Jenkins Builder, laforge, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-pcu/+/39188?usp=email
to look at the new patch set (#4).
The following approvals got outdated and were removed:
Code-Review+2 by fixeria, Verified+1 by Jenkins Builder
The change is no longer submittable: Code-Review and Verified are unsatisfied now.
Change subject: gsm_rlcmac: fix EGPRS BEP Link Quality Measurements Type 2
......................................................................
gsm_rlcmac: fix EGPRS BEP Link Quality Measurements Type 2
This IE is defined in 3GPP TS 44.060 Table 12.5a.2.1. Each presence
bit indicates presence of the next two entries, not one.
This patch does affect the output of csn1_ts_44_060_test, though it
does not fix decoding because it's caused by an unrelated problem.
Early versions of 3GPP TS 44.060 required to use the standard
2b-padding. Later versions added release extensions and say that 0 **
(zero padding) shall be used. This does not take backwards
compatibility into account, and makes it hard to parse RLC/MAC PDUs
originated by old phones. In this case the PDU has 2b2b2b at the end,
but we implement the recent version of 3GPP, so we try to parse padding
and run into problems...
Related: libosmo-gprs.git Iac4de18ef25386f774bb409201b7a7996d1c8824
Change-Id: I061ac16df5e6413266de08884f791f0264791192
---
M src/gsm_rlcmac.c
M tests/rlcmac/RLCMACTest.err
2 files changed, 10 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/88/39188/4
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/39188?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I061ac16df5e6413266de08884f791f0264791192
Gerrit-Change-Number: 39188
Gerrit-PatchSet: 4
Gerrit-Owner: fixeria <vyanitskiy(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-Attention: fixeria <vyanitskiy(a)sysmocom.de>