pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/40713?usp=email )
Change subject: cosmetic: sgsnemu: Fix trailing whitespace
......................................................................
cosmetic: sgsnemu: Fix trailing whitespace
Also make linter happy:
sgsnemu/cmdline.c:4: WARNING:LEADING_SPACE: please, no spaces at the start of a line
Change-Id: Ie89a9f9de64cd59d21341b6f381b32f56693840f
---
M sgsnemu/cmdline.c
M sgsnemu/cmdline.ggo
2 files changed, 10 insertions(+), 10 deletions(-)
Approvals:
fixeria: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/sgsnemu/cmdline.c b/sgsnemu/cmdline.c
index 604e76b..e287116 100644
--- a/sgsnemu/cmdline.c
+++ b/sgsnemu/cmdline.c
@@ -1,12 +1,12 @@
/*
- File autogenerated by gengetopt version 2.22.6
- generated with the following command:
- gengetopt --conf-parser
-
- The developers of gengetopt consider the fixed text that goes in all
- gengetopt output files to be in the public domain:
- we make no copyright claims on it.
-*/
+ * File autogenerated by gengetopt version 2.22.6
+ * generated with the following command:
+ * gengetopt --conf-parser
+ *
+ * The developers of gengetopt consider the fixed text that goes in all
+ * gengetopt output files to be in the public domain:
+ * we make no copyright claims on it.
+ */
/* If we use autoconf. */
#ifdef HAVE_CONFIG_H
diff --git a/sgsnemu/cmdline.ggo b/sgsnemu/cmdline.ggo
index 0d074aa..54db05b 100644
--- a/sgsnemu/cmdline.ggo
+++ b/sgsnemu/cmdline.ggo
@@ -1,11 +1,11 @@
# OsmoGGSN - Gateway GPRS Support Node
# Copyright (C) 2002, 2003, 2004 Mondru AB.
-#
+#
# The contents of this file may be used under the terms of the GNU
# General Public License Version 2, provided that the above copyright
# notice and this permission notice is included in all copies or
# substantial portions of the software.
-#
+#
# Use
# gengetopt --conf-parser < cmdline.ggo
# linux-2.6/scripts/Lindent cmdline.c
--
To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/40713?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-Change-Id: Ie89a9f9de64cd59d21341b6f381b32f56693840f
Gerrit-Change-Number: 40713
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: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40702?usp=email )
Change subject: sccp_sclc: Remove SCCP cause mask in N-NOTICE.ind 'Reason for return' field
......................................................................
sccp_sclc: Remove SCCP cause mask in N-NOTICE.ind 'Reason for return' field
ITU Q.713 A.5 states "There is a one-to-one mapping between the return cause of
UDTS, XUDTS or LUDTS messages and the reason for return in the N-NOTICE
primitives".
This matches with the list of strings listed in ITU Q.711 6.2.2.2.4
"Reason for return".
"return cause" can in turn be found in ITU Q.713 3.12.
During sccp_sclc_rx_scrc_rout_fail(), we are encoding the "return cause"
param into the xua_msg usig gen_ret_msg(), which encodes it as SUA by
prepending the SUA_CAUSE_T_RETURN bitmask cause-type to it.
However, when constructing the primitive N-NOTICE.ind, we need to remove
that mask when filling in "Reason for return".
Change-Id: Iccff1e8809769edae36081a79119eb8da901841a
---
M include/osmocom/sigtran/sccp_sap.h
M src/sccp_sclc.c
2 files changed, 4 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
diff --git a/include/osmocom/sigtran/sccp_sap.h b/include/osmocom/sigtran/sccp_sap.h
index 65eff74..7399b3d 100644
--- a/include/osmocom/sigtran/sccp_sap.h
+++ b/include/osmocom/sigtran/sccp_sap.h
@@ -256,8 +256,10 @@
struct osmo_scu_notice_param {
struct osmo_sccp_addr called_addr;
struct osmo_sccp_addr calling_addr;
+ /* ITU Q.711 6.2.2.2.4 "Reason for return":
+ * enum sccp_return_cause (ITU Q.713 3.12), as per ITU Q.713 A.5. */
uint32_t cause;
- uint32_t importance;
+ uint32_t importance; /* ITU Q.711 6.2.2.2.6, Q.713 3.19 */
/* user data */
};
diff --git a/src/sccp_sclc.c b/src/sccp_sclc.c
index c7dce89..0a47cd9 100644
--- a/src/sccp_sclc.c
+++ b/src/sccp_sclc.c
@@ -287,7 +287,7 @@
}
param->importance = xua_msg_get_u32(xua, SUA_IEI_IMPORTANCE);
- param->cause = xua_msg_get_u32(xua, SUA_IEI_CAUSE);
+ param->cause = xua_msg_get_u32(xua, SUA_IEI_CAUSE) & ~SUA_CAUSE_T_MASK;
scu = sccp_user_find(inst, param->called_addr.ssn,
param->called_addr.pc);
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40702?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: Iccff1e8809769edae36081a79119eb8da901841a
Gerrit-Change-Number: 40702
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: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40719?usp=email )
Change subject: testenv: run requirements check before cfg init
......................................................................
testenv: run requirements check before cfg init
When parsing testenv.cfg files, the titan_min version gets compared with
the installed titan version. This fails with a python trace if titan is
not installed. Catch this earlier by running the requirements check
first, which ensures ttcn3_compiler is avaiable or gives a helpful error
message:
[testenv] Missing program: ttcn3_compiler
[testenv] Install eclipse-titan, e.g. from osmocom:latest:
[testenv] https://osmocom.org/projects/cellular-infrastructure/wiki/Binary_Packages
Fixes: 18eef740 ("testenv: support using multiple titan versions")
Change-Id: I09ed7af5b236aeffd910d7c0a1a0b63a78631ade
---
M _testenv/testenv.py
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/19/40719/1
diff --git a/_testenv/testenv.py b/_testenv/testenv.py
index 2aac11e..ebc625e 100755
--- a/_testenv/testenv.py
+++ b/_testenv/testenv.py
@@ -29,12 +29,12 @@
def run():
+ testenv.requirements.check()
testenv.testenv_cfg.init()
if not testenv.args.binary_repo:
testenv.osmo_dev.check_init_needed()
- testenv.requirements.check()
testenv.podman_install.init()
testenv.cmd.init_env()
testenv.testdir.init()
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40719?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I09ed7af5b236aeffd910d7c0a1a0b63a78631ade
Gerrit-Change-Number: 40719
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40718?usp=email )
Change subject: testenv/requirements: update link
......................................................................
testenv/requirements: update link
Adjust the link, as the Latest_Builds wiki page was merged into
Binary_Packages.
Change-Id: Ie8a6df2f8fd08983532c8a757ae1849792fbd5b3
---
M _testenv/testenv/requirements.py
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/18/40718/1
diff --git a/_testenv/testenv/requirements.py b/_testenv/testenv/requirements.py
index 540fe55..54d07fe 100644
--- a/_testenv/testenv/requirements.py
+++ b/_testenv/testenv/requirements.py
@@ -62,7 +62,7 @@
if program == "ttcn3_compiler":
logging.error(" Install eclipse-titan, e.g. from osmocom:latest:")
- logging.error(" https://osmocom.org/projects/cellular-infrastructure/wiki/Latest_Builds")
+ logging.error(" https://osmocom.org/projects/cellular-infrastructure/wiki/Binary_Packages")
abort = True
if abort:
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40718?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ie8a6df2f8fd08983532c8a757ae1849792fbd5b3
Gerrit-Change-Number: 40718
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>