osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41247?usp=email )
Change subject: fix SCCP_MAX_OPTIONAL_DATA 128
......................................................................
fix SCCP_MAX_OPTIONAL_DATA 128
Related: SYS#7600
Change-Id: I841dbb2e8cbc13708ba7f5593f6bdd3b8da4329c
(cherry picked from commit 6ea68a2308f8ad008e1e75959d2411999bc8c3eb)
---
M include/osmocom/sccp/sccp_types.h
M src/sccp_vty.c
M tests/vty/osmo_stp_test.vty
M tests/vty/ss7_asp_test.vty
4 files changed, 26 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/47/41247/1
diff --git a/include/osmocom/sccp/sccp_types.h b/include/osmocom/sccp/sccp_types.h
index 5be0392..ab688b3 100644
--- a/include/osmocom/sccp/sccp_types.h
+++ b/include/osmocom/sccp/sccp_types.h
@@ -24,7 +24,25 @@
#include <osmocom/core/endian.h>
#include <osmocom/core/utils.h>
-#define SCCP_MAX_OPTIONAL_DATA 130
+/* ITU Q.713 3.16 Data is a variable-length IE, meaning it has two header
+ * octets:
+ * - one octet of "Parameter name code",
+ * - plus one octet of length.
+ *
+ * In
+ * - 4.2 CR,
+ * - 4.3 CC,
+ * - 4.4 CREF,
+ * - 4.5 RLSD,
+ * there are optional "Data" IEs with length indicated as "3-130" octets: the
+ * minimum of 3 stems from the two header octets plus one data octet. Note that
+ * when there are zero data octets, the entire "Data" IE is omitted.
+ *
+ * Hence, the maximum of 130 includes the two header octets, and the actual
+ * maximum data length is 128.
+ */
+#define SCCP_MAX_OPTIONAL_DATA 128
+
#define SCCP_MAX_DATA 256
/* Table 1/Q.713 - SCCP message types */
diff --git a/src/sccp_vty.c b/src/sccp_vty.c
index 49f3577..a969423 100644
--- a/src/sccp_vty.c
+++ b/src/sccp_vty.c
@@ -174,10 +174,10 @@
"Adjust the upper bound for the optional data length (the payload) for CR, CC, CREF and RLSD messages."
" For any Optional Data part larger than this value in octets, send CR, CC, CREF and RLSD"
" messages without any payload, and send the data payload in a separate Data Form 1 message."
- " ITU-T Q.713 sections 4.2 thru 4.5 define a limit of 130 bytes for the 'Data' parameter. This limit can be"
+ " ITU-T Q.713 sections 4.2 thru 4.5 define a limit of 128 bytes for the 'Data' parameter. This limit can be"
" adjusted here. May be useful for interop with nonstandard SCCP peers.\n"
"Set a non-standard maximum allowed number of bytes\n"
- "Use the ITU-T Q.713 4.2 to 4.5 standard value of 130\n",
+ "Use the ITU-T Q.713 4.2 to 4.5 standard value of 128\n",
CMD_ATTR_IMMEDIATE)
{
struct osmo_ss7_instance *ss7 = vty->index;
diff --git a/tests/vty/osmo_stp_test.vty b/tests/vty/osmo_stp_test.vty
index cb24560..56b48c5 100644
--- a/tests/vty/osmo_stp_test.vty
+++ b/tests/vty/osmo_stp_test.vty
@@ -528,11 +528,11 @@
<1-999999> Timer value, in seconds
OsmoSTP(config-cs7)# sccp ?
- max-optional-data Adjust the upper bound for the optional data length (the payload) for CR, CC, CREF and RLSD messages. For any Optional Data part larger than this value in octets, send CR, CC, CREF and RLSD messages without any payload, and send the data payload in a separate Data Form 1 message. ITU-T Q.713 sections 4.2 thru 4.5 define a limit of 130 bytes for the 'Data' parameter. This limit can be adjusted here. May be useful for interop with nonstandard SCCP peers.
+ max-optional-data Adjust the upper bound for the optional data length (the payload) for CR, CC, CREF and RLSD messages. For any Optional Data part larger than this value in octets, send CR, CC, CREF and RLSD messages without any payload, and send the data payload in a separate Data Form 1 message. ITU-T Q.713 sections 4.2 thru 4.5 define a limit of 128 bytes for the 'Data' parameter. This limit can be adjusted here. May be useful for interop with nonstandard SCCP peers.
OsmoSTP(config-cs7)# sccp max-optional-data ?
<0-999999> Set a non-standard maximum allowed number of bytes
- standard Use the ITU-T Q.713 4.2 to 4.5 standard value of 130
+ standard Use the ITU-T Q.713 4.2 to 4.5 standard value of 128
OsmoSTP(config-cs7)# show running-config
... !sccp max-optional-data
@@ -563,7 +563,7 @@
OsmoSTP(config-cs7)# show running-config
... !sccp max-optional-data
-OsmoSTP(config-cs7)# sccp max-optional-data 130
+OsmoSTP(config-cs7)# sccp max-optional-data 128
OsmoSTP(config-cs7)# show running-config
... !sccp max-optional-data
diff --git a/tests/vty/ss7_asp_test.vty b/tests/vty/ss7_asp_test.vty
index b565557..f83a452 100644
--- a/tests/vty/ss7_asp_test.vty
+++ b/tests/vty/ss7_asp_test.vty
@@ -513,11 +513,11 @@
<1-999999> Timer value, in seconds
ss7_asp_vty_test(config-cs7)# sccp ?
- max-optional-data Adjust the upper bound for the optional data length (the payload) for CR, CC, CREF and RLSD messages. For any Optional Data part larger than this value in octets, send CR, CC, CREF and RLSD messages without any payload, and send the data payload in a separate Data Form 1 message. ITU-T Q.713 sections 4.2 thru 4.5 define a limit of 130 bytes for the 'Data' parameter. This limit can be adjusted here. May be useful for interop with nonstandard SCCP peers.
+ max-optional-data Adjust the upper bound for the optional data length (the payload) for CR, CC, CREF and RLSD messages. For any Optional Data part larger than this value in octets, send CR, CC, CREF and RLSD messages without any payload, and send the data payload in a separate Data Form 1 message. ITU-T Q.713 sections 4.2 thru 4.5 define a limit of 128 bytes for the 'Data' parameter. This limit can be adjusted here. May be useful for interop with nonstandard SCCP peers.
ss7_asp_vty_test(config-cs7)# sccp max-optional-data ?
<0-999999> Set a non-standard maximum allowed number of bytes
- standard Use the ITU-T Q.713 4.2 to 4.5 standard value of 130
+ standard Use the ITU-T Q.713 4.2 to 4.5 standard value of 128
ss7_asp_vty_test(config-cs7)# show running-config
... !sccp max-optional-data
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41247?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: osmith/2.1.2
Gerrit-Change-Id: I841dbb2e8cbc13708ba7f5593f6bdd3b8da4329c
Gerrit-Change-Number: 41247
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/41245?usp=email )
Change subject: jobs/ttcn3-testsuites-testenv: mme: use -c all
......................................................................
jobs/ttcn3-testsuites-testenv: mme: use -c all
Adjust to MME tests now having two configurations in osmo-ttcn3-hacks:
[testenv] Found multiple testenv.cfg files, use one of:
[testenv] -c emergency
[testenv] -c generic
[testenv] You can also select all of them (-c all) or use the * character as wildcard.
Related: osmo-ttcn3-hacks I3d84486dd3826d0f60a3c06693118e36b01ecd2b
Change-Id: Id2296c7cfe1660cc443f08efea209f8bf61aa8b6
---
M jobs/ttcn3-testsuites-testenv.yml
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/45/41245/1
diff --git a/jobs/ttcn3-testsuites-testenv.yml b/jobs/ttcn3-testsuites-testenv.yml
index 92bc1d0..084527f 100644
--- a/jobs/ttcn3-testsuites-testenv.yml
+++ b/jobs/ttcn3-testsuites-testenv.yml
@@ -119,7 +119,7 @@
- ttcn3-mme-test-ogs: # ~2 min
testsuite: mme
- args: -b osmocom:nightly
+ args: -b osmocom:nightly -c all
timer: H 09 * * *
email: jenkins-notifications(a)lists.osmocom.org acetcom(a)gmail.com
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/41245?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Id2296c7cfe1660cc443f08efea209f8bf61aa8b6
Gerrit-Change-Number: 41245
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Attention is currently required from: tempest, tnt, ttsou.
laforge has posted comments on this change by tempest. ( https://gerrit.osmocom.org/c/osmo-trx/+/41231?usp=email )
Change subject: trx: Fix tx/rx-sps 4 for USRP1 devices
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
would someone be as kind as to address the linter complaints, this way we can get a V+1 for this patch, whose absence (V-1) is currently blocking the merge of this patch
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/41231?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I3b08c23a3e7d4a226cd23b9fe42558f596a63257
Gerrit-Change-Number: 41231
Gerrit-PatchSet: 1
Gerrit-Owner: tempest <jackleea1b(a)gmail.com>
Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: tnt <tnt(a)246tNt.com>
Gerrit-Reviewer: ttsou <tom(a)tsou.cc>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: tempest <jackleea1b(a)gmail.com>
Gerrit-Attention: tnt <tnt(a)246tNt.com>
Gerrit-Attention: ttsou <tom(a)tsou.cc>
Gerrit-Comment-Date: Wed, 22 Oct 2025 09:11:01 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No