Change in osmo-bsc[master]: VTY: fix writing of custom timer values to a configuration file
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bsc/+/16923 )
Change subject: VTY: fix writing of custom timer values to a configuration file
..
VTY: fix writing of custom timer values to a configuration file
Calling osmo_tdef_vty_write() twice: with and without the 'timer '
prefix definitely looks like a bug. After setting any timer to a
custom (non-default) value, config_write_net() would generate an
incorrect configuration file:
$ osmo-bsc -c /tmp/osmo-bsc.cfg
There is no such command.
Error occurred during reading the below line:
T10 10
Change-Id: I5cc893fb2077bb21f1f661e30a7ab2af1b9bd561
---
M src/osmo-bsc/bsc_vty.c
1 file changed, 0 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/23/16923/1
diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c
index 1195d65..d1a268d 100644
--- a/src/osmo-bsc/bsc_vty.c
+++ b/src/osmo-bsc/bsc_vty.c
@@ -1062,8 +1062,6 @@
ho_vty_write_net(vty, gsmnet);
- osmo_tdef_vty_write(vty, gsmnet->T_defs, " ");
-
if (!gsmnet->dyn_ts_allow_tch_f)
vty_out(vty, " dyn_ts_allow_tch_f 0%s", VTY_NEWLINE);
if (gsmnet->tz.override != 0) {
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16923
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I5cc893fb2077bb21f1f661e30a7ab2af1b9bd561
Gerrit-Change-Number: 16923
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in osmo-bts[master]: L1SAP: use LOGL_DEBUG for logging from rach_pass_filter()
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/16800 )
Change subject: L1SAP: use LOGL_DEBUG for logging from rach_pass_filter()
..
L1SAP: use LOGL_DEBUG for logging from rach_pass_filter()
Due to relatively small training sequence of Access Bursts, there
can be frequent false-positives (basically noise). Fortunately,
we can distinguish them from the real Access Bursts by checking
the signal measurements attached to them (BER, ToA and C/I).
Let's reduce verbosity of logging messages as they are mostly
useful for debugging and may confuse the users / operators.
Change-Id: I7ab672700140a7f9e762b299b711481393f1
---
M src/common/l1sap.c
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
keith: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/src/common/l1sap.c b/src/common/l1sap.c
index b73de29..889f7f6 100644
--- a/src/common/l1sap.c
+++ b/src/common/l1sap.c
@@ -1358,7 +1358,7 @@
/* Check for RACH exceeding BER threshold (ghost RACH) */
if (rach_ind->ber10k > bts->max_ber10k_rach) {
- LOGPFN(DL1C, LOGL_INFO, rach_ind->fn, "Ignoring an Access Burst
on %s: "
+ LOGPFN(DL1C, LOGL_DEBUG, rach_ind->fn, "Ignoring an Access
Burst on %s: "
"BER10k(%u) > BER10k_MAX(%u)\n", chan_name,
rach_ind->ber10k, bts->max_ber10k_rach);
return false;
@@ -1370,7 +1370,7 @@
* according to maximal allowed Timing Advance value.
*/
if (toa256 < RACH_MIN_TOA256 || toa256 > bts->max_ta * 256) {
- LOGPFN(DL1C, LOGL_INFO, rach_ind->fn, "Ignoring an Access Burst
on %s: "
+ LOGPFN(DL1C, LOGL_DEBUG, rach_ind->fn, "Ignoring an Access
Burst on %s: "
"ToA(%d) exceeds the allowed range (%d..%d)\n",
chan_name,
toa256, RACH_MIN_TOA256, bts->max_ta * 256);
return false;
@@ -1378,7 +1378,7 @@
/* Link quality defined by C/I (Carrier-to-Interference ratio) */
if (rach_ind->lqual_cb < bts->min_qual_rach) {
- LOGPFN(DL1C, LOGL_INFO, rach_ind->fn, "Ignoring an Access Burst
on %s: "
+ LOGPFN(DL1C, LOGL_DEBUG, rach_ind->fn, "Ignoring an Access
Burst on %s: "
"link quality (%d) below the minimum (%d)\n", chan_name,
rach_ind->lqual_cb, bts->min_qual_rach);
return false;
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16800
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I7ab672700140a7f9e762b299b711481393f1
Gerrit-Change-Number: 16800
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: keith
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-bts[master]: L1SAP: use LOGL_DEBUG for logging from rach_pass_filter()
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16800 ) Change subject: L1SAP: use LOGL_DEBUG for logging from rach_pass_filter() .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16800 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7ab672700140a7f9e762b299b711481393f1 Gerrit-Change-Number: 16800 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jan 2020 21:10:36 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: Introduce ttcn-sccp dockerized setup
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16893 ) Change subject: Introduce ttcn-sccp dockerized setup .. Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16893 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I5a7e6ff5f6e5f6e34d6a5ab29bd760a6f9d49c4b Gerrit-Change-Number: 16893 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jan 2020 21:10:06 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: Introduce ttcn-sccp dockerized setup
laforge has submitted this change. (
https://gerrit.osmocom.org/c/docker-playground/+/16893 )
Change subject: Introduce ttcn-sccp dockerized setup
..
Introduce ttcn-sccp dockerized setup
Since examples/sccp_demo_user (the binary used to test SCCP) is not
installed by libosmo-sccp.git during make install, we need to install it
manually after "make" step, and hence it's only available in
osmo-stp-master, because in osmo-stp-latest we used packaged files.
Related: OS#4343
Depends: osmo-ttcn3-hacks.git Ied9fbfb9bd35a99205ca13db033dd9ea03d51238
Change-Id: I5a7e6ff5f6e5f6e34d6a5ab29bd760a6f9d49c4b
---
M osmo-stp-master/Dockerfile
A ttcn3-sccp-test/Dockerfile
A ttcn3-sccp-test/Makefile
A ttcn3-sccp-test/SCCP_Tests.cfg
A ttcn3-sccp-test/jenkins.sh
5 files changed, 109 insertions(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, approved; Verified
diff --git a/osmo-stp-master/Dockerfile b/osmo-stp-master/Dockerfile
index 622d0b9..e76e5a9 100644
--- a/osmo-stp-master/Dockerfile
+++ b/osmo-stp-master/Dockerfile
@@ -32,6 +32,7 @@
autoreconf -fi && \
./configure && \
make -j8 install && \
+ install examples/sccp_demo_user /usr/local/bin/ && \
ldconfig
VOLUME /data
diff --git a/ttcn3-sccp-test/Dockerfile b/ttcn3-sccp-test/Dockerfile
new file mode 100644
index 000..d9c3232
--- /dev/null
+++ b/ttcn3-sccp-test/Dockerfile
@@ -0,0 +1,35 @@
+ARGUSER
+FROM $USER/debian-stretch-titan
+
+RUNmkdir /root/projects && (cd /root/projects && ln -sf / git)
+RUNgit clone git://git.osmocom.org/osmo-ttcn3-hacks.git
+
+RUNcd osmo-ttcn3-hacks && \
+ git checkout -f -B master origin/master && \
+ make deps
+
+RUNgit config --global user.email doc...@dock.er && \
+ git config --global user.name "Dock Er"
+
+ARGOSMO_TTCN3_BRANCH="master"
+
+ADDhttp://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH
/tmp/commit
+RUNcd osmo-ttcn3-hacks && \
+ git fetch && \
+ git checkout $OSMO_TTCN3_BRANCH && \
+ (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH
|| exit 1); \
+ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
+ make sccp
+
+VOLUME /data
+
+RUNln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \
+ ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh /
+
+COPY SCCP_Tests.cfg /data/SCCP_Tests.cfg
+
+CMDcd /data && \
+ /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/sccp/SCCP_Tests;
\
+ exit_code=$?; \
+ /osmo-ttcn3-hacks/log_merge.sh SCCP_Tests --rm; \
+ exit $exit_code
diff --git a/ttcn3-sccp-test/Makefile b/ttcn3-sccp-test/Makefile
new file mode 100644
index 000..cbcd544
--- /dev/null
+++ b/ttcn3-sccp-test/Makefile
@@ -0,0 +1,3 @@
+RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran
--ip 172.18.2.202 -v ggsn-test-vol:/data
+
+include ../make/Makefile
diff --git a/ttcn3-sccp-test/SCCP_Tests.cfg b/ttcn3-sccp-test/SCCP_Tests.cfg
new file mode 100644
index 000..0d6a91b
--- /dev/null
+++ b/ttcn3-sccp-test/SCCP_Tests.cfg
@@ -0,0 +1,30 @@
+[ORDERED_INCLUDE]
+"/osmo-ttcn3-hacks/Common.cfg"
+"/osmo-ttcn3-hacks/sccp/SCCP_Tests.default"
+
+[LOGGING]
+*.JUnitLogger.testsuite_name := "SCCP_Tests"
+
+[TESTPORT_PARAMETERS]
+*.SCCP_DEMO_USER_VTY.CTRL_HOSTNAME := "172.18.22.200"
+*.SCCP_DEMO_USER_VTY.CTRL_PORTNUM := "2324"
+
+[MODULE_PARAMETERS]
+SCCP_Tests.mp_sccp_cfg := {
+{
+sccp_service_type := "mtp3_itu",
+sctp_addr := { 2905, "172.18.22.203", 2905,
"172.18.22.200" },
+own_pc := 23,
+own_ssn := 202, /* sscp_test_server.c: SSN_TEST_ECHO */
+peer_pc := 1,
+peer_ssn := 202, /* sscp_test_server.c: SSN_TEST_ECHO
*/
+sio := '03'O, /* NI=Internal, SCCP */
+rctx := 0
+}
+};
+
+[MAIN_CONTROLLER]
+
+[EXECUTE]
+SCCP_Tests.control
+SCCP_Tests_RAW.control
diff --git a/ttcn3-sccp-test/jenkins.sh b/ttcn3-sccp-test/jenkins.sh
new file mode 100755
index 000..550dc43
--- /dev/null
+++ b/ttcn3-sccp-test/jenkins.sh
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+. ../jenkins-common.sh
+IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
+# Always require osmo-stp-master since is the only with sccp_demo_user
installed
+docker_images_require \
+ "debian-stretch-build" \
+ "osmo-stp-master" \
+ "debian-stretch-titan" \
+ "ttcn3-sccp-test"
+
+mkdir $VOL_BASE_DIR/sccp-tester
+cp SCCP_Tests.cfg $VOL_BASE_DIR/sccp-tester/
+
+mkdir $VOL_BASE_DIR/sccp
+#cp osmo-sccp.cfg $VOL_BASE_DIR/sccp/
+
+network_create 172.18.22.0/24
+
+echo Starting container with sccp_demo_user
+docker run --rm \
+ --network $NET_NAME --ip 172.18.22.200 \
+ -v $VOL_BASE_DIR/sccp:/data \
+ --name ${BUILD_TAG}-stp -d \
+
Change in osmo-ci[master]: ttcn3-testsuites.yml: Add job for ttcn3-sccp-test
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ci/+/16922 )
Change subject: ttcn3-testsuites.yml: Add job for ttcn3-sccp-test
..
ttcn3-testsuites.yml: Add job for ttcn3-sccp-test
Only for nightly, not latest, since example/sccp_demo_user is not
installed by autotools and debian packages, so only in nightly where we
build from source we are able to copy it to docker image manually.
Related: OS#4343
Change-Id: Ia0a68d74215bdc1bc6319241d60f858312fa14e9
---
M jobs/ttcn3-testsuites.yml
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, approved; Verified
diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml
index 7bd72db..89d50cf 100644
--- a/jobs/ttcn3-testsuites.yml
+++ b/jobs/ttcn3-testsuites.yml
@@ -43,6 +43,8 @@
timer: 00 09 * * *
- ttcn3-stp-test:
timer: 30 09 * * *
+ - ttcn3-sccp-test:
+ timer: 00 10 * * *
# latest stable
- nplab-m3ua-test-latest:
@@ -77,6 +79,8 @@
blocking: "^ttcn3-remsim-test.*"
- ttcn3-stp-test-latest:
blocking: "^ttcn3-stp-test.*"
+ #- ttcn3-sccp-test-latest:
+ #blocking: "^ttcn3-sccp-test.*"
- job-template:
name: '{job-name}'
project-type: freestyle
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16922
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Ia0a68d74215bdc1bc6319241d60f858312fa14e9
Gerrit-Change-Number: 16922
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in docker-playground[master]: Introduce ttcn-sccp dockerized setup
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16893 ) Change subject: Introduce ttcn-sccp dockerized setup .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16893 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I5a7e6ff5f6e5f6e34d6a5ab29bd760a6f9d49c4b Gerrit-Change-Number: 16893 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jan 2020 21:09:32 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: ttcn3-testsuites.yml: Add job for ttcn3-sccp-test
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16922 ) Change subject: ttcn3-testsuites.yml: Add job for ttcn3-sccp-test .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16922 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia0a68d74215bdc1bc6319241d60f858312fa14e9 Gerrit-Change-Number: 16922 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 17 Jan 2020 21:09:52 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: sccp: Rename module param sccp_cfg to mp_sccp_cfg
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16921 ) Change subject: sccp: Rename module param sccp_cfg to mp_sccp_cfg .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16921 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ied9fbfb9bd35a99205ca13db033dd9ea03d51238 Gerrit-Change-Number: 16921 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 17 Jan 2020 21:08:42 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: sccp: Modify SCCP_tests to be run against sccp_demo_user in srv mode
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16920 )
Change subject: sccp: Modify SCCP_tests to be run against sccp_demo_user in srv
mode
..
sccp: Modify SCCP_tests to be run against sccp_demo_user in srv mode
It's easier to handle several tests if they are the ones connecting to
the program under tests.
Forthcoming SCCP_Tests_RAW require use of this mode too.
Take the chance to tweak other values which were wrong, in order to have
CR answered correctly with a CC later on.
Related: OS#4343
Change-Id: Ibf99b1546411b9a9b4375b82f1003d93d3c1645d
---
M sccp/SCCP_Tests.cfg
M sccp/SCCP_Tests.default
M sccp/SCCP_Tests.ttcn
3 files changed, 12 insertions(+), 16 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/sccp/SCCP_Tests.cfg b/sccp/SCCP_Tests.cfg
index 4b7e742..ab69a2d 100644
--- a/sccp/SCCP_Tests.cfg
+++ b/sccp/SCCP_Tests.cfg
@@ -16,4 +16,3 @@
[EXECUTE]
SCCP_Tests.control
-#SCCP_Tests.TC_routing_global_title_crash
diff --git a/sccp/SCCP_Tests.default b/sccp/SCCP_Tests.default
index f837664..a051517 100644
--- a/sccp/SCCP_Tests.default
+++ b/sccp/SCCP_Tests.default
@@ -1,16 +1,10 @@
[LOGGING]
FileMask := LOG_ALL | TTCN_MATCHING | DEBUG_ENCDEC;
-BSSAP.FileMask := LOG_NOTHING;
-"SCCP_Test_M3UA".FileMask := ERROR | WARNING;
-"SCCP_Test_SCCP".FileMask := ERROR | WARNING;
-"IPA-CTRL-IPA".FileMask := ERROR | WARNING;
-mtc.FileMask := ERROR | WARNING;
-
[TESTPORT_PARAMETERS]
*.SCCP_DEMO_USER_VTY.CTRL_MODE := "client"
-*.SCCP_DEMO_USER_VTY.CTRL_HOSTNAME := "127.0.0.1"
-*.SCCP_DEMO_USER_VTY.CTRL_PORTNUM := "2325"
+*.SCCP_DEMO_USER_VTY.CTRL_HOSTNAME := "127.0.0.2"
+*.SCCP_DEMO_USER_VTY.CTRL_PORTNUM := "2324"
*.SCCP_DEMO_USER_VTY.CTRL_LOGIN_SKIPPED := "yes"
*.SCCP_DEMO_USER_VTY.CTRL_DETECT_SERVER_DISCONNECTED := "yes"
*.SCCP_DEMO_USER_VTY.CTRL_READMODE := "buffered"
@@ -20,17 +14,17 @@
[MODULE_PARAMETERS]
M3UA_Emulation.tsp_logVerbose := true;
-M3UA_Emulation.tsp_SCTP_Server_Mode := true;
-M3UA_Emulation.tsp_M3UA_Server_Mode := true;
+M3UA_Emulation.tsp_SCTP_Server_Mode := false;
+M3UA_Emulation.tsp_M3UA_Server_Mode := false;
SCCP_Tests.sccp_cfg := {
{
sccp_service_type := "mtp3_itu",
sctp_addr := { 2905, "127.0.0.1", 2905, "127.0.0.2" },
- own_pc := 185,
- own_ssn := 254,
- peer_pc := 23,
- peer_ssn := 254,
- sio := '83'O,
+ own_pc := 23,
+ own_ssn := 202, /* sscp_test_server.c: SSN_TEST_ECHO */
+ peer_pc := 1,
+ peer_ssn := 202, /* sscp_test_server.c: SSN_TEST_ECHO */
+ sio := '03'O, /* NI=Internal, SCCP */
rctx := 0
}
};
diff --git a/sccp/SCCP_Tests.ttcn b/sccp/SCCP_Tests.ttcn
index e76e9ac..835c934 100644
--- a/sccp/SCCP_Tests.ttcn
+++ b/sccp/SCCP_Tests.ttcn
@@ -2,6 +2,9 @@
* Author: Stefan Sperling
* All Rights Reserved
*
+ * The idea is that these tests are executed against sccp_demo_user from
+ * libosmo-sccp.git in server mode.
+ *
* Released under the terms of GNU General Public License, Version 2 or
* (at your option) any later version.
*
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16920
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ibf99b1546411b9a9b4375b82f1003d93d3c1645d
Gerrit-Change-Number: 16920
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: Add SCCP_Tests_RAW for testing the actual SCCP implementation
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16814 )
Change subject: Add SCCP_Tests_RAW for testing the actual SCCP implementation
..
Add SCCP_Tests_RAW for testing the actual SCCP implementation
Using SCCP_Tests_RAW.ttcn we can trasnceive decoded MTP3 primitives
containing decoded SCCP messages against a remote SCCP implementation.
Related: OS#4343
Change-Id: I07c43cfac9cdbdeccf102cd08309ca9ec64968cc
---
A sccp/SCCP_CodecPort.ttcn
M sccp/SCCP_Tests.cfg
A sccp/SCCP_Tests_RAW.ttcn
3 files changed, 248 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/sccp/SCCP_CodecPort.ttcn b/sccp/SCCP_CodecPort.ttcn
new file mode 100644
index 000..838517a
--- /dev/null
+++ b/sccp/SCCP_CodecPort.ttcn
@@ -0,0 +1,73 @@
+module SCCP_CodecPort {
+
+/* Simple SCCP Codec Port, translating between raw MTP3 primitives with
+ * octetstring payload towards the MTP3 provider, and MTP3-SCCP primitives
+ * which carry the decoded SCCP data types as payload.
+ *
+ * (C) 2019 by Harald Welte
+ * All rights reserved.
+ *
+ * Released under the terms of GNU General Public License, Version 2 or
+ * (at your option) any later version.
+ */
+
+import from General_Types all;
+import from Osmocom_Types all;
+
+import from MTP3asp_Types all;
+import from MTP3asp_PortType all;
+import from SCCP_Types all;
+
+/* MTP3asp_Types.Types.MessageTypes.ASP_MTP3_TRANSFERind with PDU_SCCP instead
of octetstring */
+type record SCCP_MTP3_TRANSFERind {
+ MTP3_Field_sio sio,
+ integer opc,
+ integer dpc,
+ integer sls,
+ PDU_SCCPdata
+};
+
+/* MTP3asp_Types.Types.MessageTypes.ASP_MTP3_TRANSFERreq with PDU_SCCP instead
of octetstring */
+type record SCCP_MTP3_TRANSFERreq {
+ MTP3_Field_sio sio,
+ integer opc,
+ integer dpc,
+ integer sls,
+ PDU_SCCPdata
+};
+
+private function f_dec_TRANSFERind(in ASP_MTP3_TRANSFERind pin, out
SCCP_MTP3_TRANSFERind pout) {
+ pout.sio := pin.sio;
+ pout.opc := pin.opc;
+ pout.dpc := pin.dpc;
+ pout.sls := pin.sls;
+ pout.data := dec_PDU_SCCP(pin.data);
+ //port.setstate(0);
+} with {extension "prototype(fast)" }
+
+
+private function f_enc_TRANSFERreq(in SCCP_MTP3_TRANSFERreq pin, out
ASP_MTP3_TRANSFERreq pout) {
+ pout.sio := pin.sio;
+ pout.opc := pin.opc;
+ pout.dpc := pin.dpc;
+ pout.sls := pin.sls;
+ pout.data := enc_PDU_SCCP(pin.data);
+ //port.setstate(0);
+} with {extension "prototype(fast)" }
+
+type port SCCP_CODEC_PT message {
+ out SCCP_MTP3_TRANSFERreq;
+ in SCCP_MTP3_TRANSFERind,
+ ASP_MTP3_PAUSE,
+ ASP_MTP3_RESUME,
+ ASP_MTP3_STATUS;
+} with { extension "internal user MTP3asp_PT
+ out(SCCP_MTP3_TRANSFERreq -> ASP_MTP3_TRANSFERreq:
function(f_enc_TRANSFERreq))
+ in(ASP_MTP3_TRANSFERind -> SCCP_MTP3_TRANSFERind:
function(f_dec_TRANSFERind);
+ ASP_MTP3_PAUSE -> ASP_MTP3_PAUSE: simple;
+ ASP_MTP3_RESUME -> ASP_MTP3_RESUME: simple;
+ ASP_MTP3_STATUS -> ASP_MTP3_STATUS: simple)"
+}
+
+
+}
diff --git a/sccp/SCCP_Tests.cfg b/sccp/SCCP_Tests.cfg
index ab69a2d..8e51327 100644
--- a/sccp/SCCP_Tests.cfg
+++ b/sccp/SCCP_Tests.cfg
@@ -16,3 +16,4 @@
[EXECUTE]
SCCP_Tests.control
+SCCP_Tests_RAW.control
diff --git a/sccp/SCCP_Tests_RAW.ttcn b/sccp/SCCP_Tests_RAW.ttcn
new file mode 100644
index 000..78ce80f
--- /dev/null
+++ b/sccp/SCCP_Tests_RAW.ttcn
@@ -0,0 +1,174 @@
+/* (C) 2019 by Harald Welte
+ * All Rights Reserved
+ *
+ * The idea is that these tests are executed against sccp_demo_user from
+ * libosmo-sccp.git in server mode.
+ *
+ * Released under the terms of GNU General Public License, Version 2 or
+ * (at your option) any later version.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+module SCCP_Tests_RAW {
+
+import from General_Types all;
+import from Osmocom_Types all;
+
+import from M3UA_Emulation all;
+
+import from SCCP_Types all;
+import from SCCPasp_Types all;
+import from SCCP_Templates all;
+import from SCCP_Emulation all;
+import from SCCP_CodecPort all;
+
+import from TELNETasp_PortType all;
+import from Osmocom_VTY_Functions all;
+
+import from SCCP_Tests all;
+
+type component SCCP_Test_RAW_CT {
+ /* VTY to sccp_demo_user (not used yet) */
+ port TELNETasp_PT SCCP_DEMO_USER_VTY;
+
+ /* SCCP raw port runs on top of M3UA Emulation.
+* "System Under Test" is libosmo-sccp's sccp_demo_user example
program. */
+ var M3UA_CT vc_M3UA;
+ port SCCP_CODEC_PT MTP3;
+
+ var MSC_SCCP_MTP3_parameters g_param;
+}
+
+private function f_init_raw(SCCP_Configuration cfg) runs on SCCP_Test_RAW_CT {
+ g_param := {
+ sio := {
+ ni :=
Change in osmo-ttcn3-hacks[master]: Add SCCP_Tests_RAW for testing the actual SCCP implementation
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16814 ) Change subject: Add SCCP_Tests_RAW for testing the actual SCCP implementation .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16814 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I07c43cfac9cdbdeccf102cd08309ca9ec64968cc Gerrit-Change-Number: 16814 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jan 2020 21:08:32 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: Add SCCP_Tests_RAW for testing the actual SCCP implementation
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16814 ) Change subject: Add SCCP_Tests_RAW for testing the actual SCCP implementation .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16814 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I07c43cfac9cdbdeccf102cd08309ca9ec64968cc Gerrit-Change-Number: 16814 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jan 2020 21:08:44 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: sccp: Rename module param sccp_cfg to mp_sccp_cfg
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16921 )
Change subject: sccp: Rename module param sccp_cfg to mp_sccp_cfg
..
sccp: Rename module param sccp_cfg to mp_sccp_cfg
Change-Id: Ied9fbfb9bd35a99205ca13db033dd9ea03d51238
---
M sccp/SCCP_Tests.default
M sccp/SCCP_Tests.ttcn
M sccp/SCCP_Tests_RAW.ttcn
3 files changed, 10 insertions(+), 10 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/sccp/SCCP_Tests.default b/sccp/SCCP_Tests.default
index a051517..6dda647 100644
--- a/sccp/SCCP_Tests.default
+++ b/sccp/SCCP_Tests.default
@@ -16,7 +16,7 @@
M3UA_Emulation.tsp_logVerbose := true;
M3UA_Emulation.tsp_SCTP_Server_Mode := false;
M3UA_Emulation.tsp_M3UA_Server_Mode := false;
-SCCP_Tests.sccp_cfg := {
+SCCP_Tests.mp_sccp_cfg := {
{
sccp_service_type := "mtp3_itu",
sctp_addr := { 2905, "127.0.0.1", 2905, "127.0.0.2" },
diff --git a/sccp/SCCP_Tests.ttcn b/sccp/SCCP_Tests.ttcn
index 835c934..62c62c6 100644
--- a/sccp/SCCP_Tests.ttcn
+++ b/sccp/SCCP_Tests.ttcn
@@ -55,7 +55,7 @@
type record of SCCP_Configuration SCCP_Configurations;
modulepar {
- SCCP_Configurations sccp_cfg;
+ SCCP_Configurations mp_sccp_cfg;
}
function f_init(SCCP_Configuration cfg) runs on MTC_CT {
@@ -106,13 +106,13 @@
var octetstring vl_userdata :='12345678901234567890'O;
var ASP_SCCP_N_UNITDATA_ind vl_N_UNITDATA_ind;
- f_init(sccp_cfg[0]);
+ f_init(mp_sccp_cfg[0]);
/* Called address with routing indicator set to Global Title Address.
This used to trigger the crash. */
v_CalledAddress := valueof(ts_SccpAddr_GT('012345'H));
- v_CallingAddress := valueof(ts_SccpAddr_PC_SSN(sccp_cfg[0].own_pc,
sccp_cfg[0].own_ssn,
- sccp_cfg[0].sio,
sccp_cfg[0].sccp_service_type));
+ v_CallingAddress := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].own_pc,
mp_sccp_cfg[0].own_ssn,
+ mp_sccp_cfg[0].sio,
mp_sccp_cfg[0].sccp_service_type));
A_PORT.send(t_ASP_N_UNITDATA_req(v_CalledAddress, v_CallingAddress,
'0001'B /* sequence control */,
'0001'B /* return option */,
vl_userdata, omit));
diff --git a/sccp/SCCP_Tests_RAW.ttcn b/sccp/SCCP_Tests_RAW.ttcn
index 78ce80f..0091cb4 100644
--- a/sccp/SCCP_Tests_RAW.ttcn
+++ b/sccp/SCCP_Tests_RAW.ttcn
@@ -156,11 +156,11 @@
/* Verify sccp_demo_user answers a CR with a CC for PC and SSN set up to echo
back */
testcase TC_cr_cc() runs on SCCP_Test_RAW_CT {
var SCCP_PAR_Address calling, called;
- called := valueof(ts_SccpAddr_PC_SSN(sccp_cfg[0].peer_pc,
sccp_cfg[0].peer_ssn,
-sccp_cfg[0].sio,
sccp_cfg[0].sccp_service_type));
- calling := valueof(ts_SccpAddr_PC_SSN(sccp_cfg[0].own_pc,
sccp_cfg[0].own_ssn,
-sccp_cfg[0].sio,
sccp_cfg[0].sccp_service_type));
- f_init_raw(sccp_cfg[0]);
+ called := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].peer_pc,
mp_sccp_cfg[0].peer_ssn,
+mp_sccp_cfg[0].sio,
mp_sccp_cfg[0].sccp_service_type));
+ calling := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].own_pc,
mp_sccp_cfg[0].own_ssn,
+mp_sccp_cfg[0].sio,
mp_sccp_cfg[0].sccp_service_type));
+ f_init_raw(mp_sccp_cfg[0]);
f_sleep(1.0);
f_send_sccp(ts_SCCP_CR('01'O, calling, called));
f_exp_sccp(tr_SCCP_CC('01'O, ?));
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16921
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ied9fbfb9bd35a99205ca13db033dd9ea03d51238
Gerrit-Change-Number: 16921
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: sccp: Modify SCCP_tests to be run against sccp_demo_user in srv mode
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16920 ) Change subject: sccp: Modify SCCP_tests to be run against sccp_demo_user in srv mode .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16920 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibf99b1546411b9a9b4375b82f1003d93d3c1645d Gerrit-Change-Number: 16920 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 17 Jan 2020 21:07:55 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: ttcn3-testsuites.yml: Add job for ttcn3-sccp-test
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16922 ) Change subject: ttcn3-testsuites.yml: Add job for ttcn3-sccp-test .. Patch Set 1: Code-Review+1 might be worth adding the reason also as comment in the yml file? -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16922 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia0a68d74215bdc1bc6319241d60f858312fa14e9 Gerrit-Change-Number: 16922 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 17 Jan 2020 21:07:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: gsm48_ie.c: Avoid compiler warnings about using deprecated API
laforge has abandoned this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16474 ) Change subject: gsm48_ie.c: Avoid compiler warnings about using deprecated API .. Abandoned The mentioned warnings have already been fixed by I1b0eff1396776900c1286e41da3aee3ff78b326e -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16474 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0e5cd06a70556e624bfed0d52405d232d8296dbc Gerrit-Change-Number: 16474 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: abandon
Change in osmo-ci[master]: ttcn3-testsuites.yml: Add job for ttcn3-sccp-test
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ci/+/16922 )
Change subject: ttcn3-testsuites.yml: Add job for ttcn3-sccp-test
..
ttcn3-testsuites.yml: Add job for ttcn3-sccp-test
Only for nightly, not latest, since example/sccp_demo_user is not
installed by autotools and debian packages, so only in nightly where we
build from source we are able to copy it to docker image manually.
Related: OS#4343
Change-Id: Ia0a68d74215bdc1bc6319241d60f858312fa14e9
---
M jobs/ttcn3-testsuites.yml
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/22/16922/1
diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml
index 7bd72db..89d50cf 100644
--- a/jobs/ttcn3-testsuites.yml
+++ b/jobs/ttcn3-testsuites.yml
@@ -43,6 +43,8 @@
timer: 00 09 * * *
- ttcn3-stp-test:
timer: 30 09 * * *
+ - ttcn3-sccp-test:
+ timer: 00 10 * * *
# latest stable
- nplab-m3ua-test-latest:
@@ -77,6 +79,8 @@
blocking: "^ttcn3-remsim-test.*"
- ttcn3-stp-test-latest:
blocking: "^ttcn3-stp-test.*"
+ #- ttcn3-sccp-test-latest:
+ #blocking: "^ttcn3-sccp-test.*"
- job-template:
name: '{job-name}'
project-type: freestyle
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16922
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Ia0a68d74215bdc1bc6319241d60f858312fa14e9
Gerrit-Change-Number: 16922
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in docker-playground[master]: Introduce ttcn-sccp dockerized setup
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16893 ) Change subject: Introduce ttcn-sccp dockerized setup .. Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16893 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I5a7e6ff5f6e5f6e34d6a5ab29bd760a6f9d49c4b Gerrit-Change-Number: 16893 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 17 Jan 2020 17:01:23 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: Add SCCP_Tests_RAW for testing the actual SCCP implementation
pespin has uploaded a new patch set (#2) to the change originally created by laforge. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16814 ) Change subject: Add SCCP_Tests_RAW for testing the actual SCCP implementation .. Add SCCP_Tests_RAW for testing the actual SCCP implementation Using SCCP_Tests_RAW.ttcn we can trasnceive decoded MTP3 primitives containing decoded SCCP messages against a remote SCCP implementation. Related: OS#4343 Change-Id: I07c43cfac9cdbdeccf102cd08309ca9ec64968cc --- A sccp/SCCP_CodecPort.ttcn M sccp/SCCP_Tests.cfg A sccp/SCCP_Tests_RAW.ttcn 3 files changed, 248 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/14/16814/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16814 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I07c43cfac9cdbdeccf102cd08309ca9ec64968cc Gerrit-Change-Number: 16814 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-ttcn3-hacks[master]: sccp: Rename module param sccp_cfg to mp_sccp_cfg
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16921 )
Change subject: sccp: Rename module param sccp_cfg to mp_sccp_cfg
..
sccp: Rename module param sccp_cfg to mp_sccp_cfg
Change-Id: Ied9fbfb9bd35a99205ca13db033dd9ea03d51238
---
M sccp/SCCP_Tests.default
M sccp/SCCP_Tests.ttcn
M sccp/SCCP_Tests_RAW.ttcn
3 files changed, 10 insertions(+), 10 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/21/16921/1
diff --git a/sccp/SCCP_Tests.default b/sccp/SCCP_Tests.default
index a051517..6dda647 100644
--- a/sccp/SCCP_Tests.default
+++ b/sccp/SCCP_Tests.default
@@ -16,7 +16,7 @@
M3UA_Emulation.tsp_logVerbose := true;
M3UA_Emulation.tsp_SCTP_Server_Mode := false;
M3UA_Emulation.tsp_M3UA_Server_Mode := false;
-SCCP_Tests.sccp_cfg := {
+SCCP_Tests.mp_sccp_cfg := {
{
sccp_service_type := "mtp3_itu",
sctp_addr := { 2905, "127.0.0.1", 2905, "127.0.0.2" },
diff --git a/sccp/SCCP_Tests.ttcn b/sccp/SCCP_Tests.ttcn
index 835c934..62c62c6 100644
--- a/sccp/SCCP_Tests.ttcn
+++ b/sccp/SCCP_Tests.ttcn
@@ -55,7 +55,7 @@
type record of SCCP_Configuration SCCP_Configurations;
modulepar {
- SCCP_Configurations sccp_cfg;
+ SCCP_Configurations mp_sccp_cfg;
}
function f_init(SCCP_Configuration cfg) runs on MTC_CT {
@@ -106,13 +106,13 @@
var octetstring vl_userdata :='12345678901234567890'O;
var ASP_SCCP_N_UNITDATA_ind vl_N_UNITDATA_ind;
- f_init(sccp_cfg[0]);
+ f_init(mp_sccp_cfg[0]);
/* Called address with routing indicator set to Global Title Address.
This used to trigger the crash. */
v_CalledAddress := valueof(ts_SccpAddr_GT('012345'H));
- v_CallingAddress := valueof(ts_SccpAddr_PC_SSN(sccp_cfg[0].own_pc,
sccp_cfg[0].own_ssn,
- sccp_cfg[0].sio,
sccp_cfg[0].sccp_service_type));
+ v_CallingAddress := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].own_pc,
mp_sccp_cfg[0].own_ssn,
+ mp_sccp_cfg[0].sio,
mp_sccp_cfg[0].sccp_service_type));
A_PORT.send(t_ASP_N_UNITDATA_req(v_CalledAddress, v_CallingAddress,
'0001'B /* sequence control */,
'0001'B /* return option */,
vl_userdata, omit));
diff --git a/sccp/SCCP_Tests_RAW.ttcn b/sccp/SCCP_Tests_RAW.ttcn
index 78ce80f..0091cb4 100644
--- a/sccp/SCCP_Tests_RAW.ttcn
+++ b/sccp/SCCP_Tests_RAW.ttcn
@@ -156,11 +156,11 @@
/* Verify sccp_demo_user answers a CR with a CC for PC and SSN set up to echo
back */
testcase TC_cr_cc() runs on SCCP_Test_RAW_CT {
var SCCP_PAR_Address calling, called;
- called := valueof(ts_SccpAddr_PC_SSN(sccp_cfg[0].peer_pc,
sccp_cfg[0].peer_ssn,
-sccp_cfg[0].sio,
sccp_cfg[0].sccp_service_type));
- calling := valueof(ts_SccpAddr_PC_SSN(sccp_cfg[0].own_pc,
sccp_cfg[0].own_ssn,
-sccp_cfg[0].sio,
sccp_cfg[0].sccp_service_type));
- f_init_raw(sccp_cfg[0]);
+ called := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].peer_pc,
mp_sccp_cfg[0].peer_ssn,
+mp_sccp_cfg[0].sio,
mp_sccp_cfg[0].sccp_service_type));
+ calling := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].own_pc,
mp_sccp_cfg[0].own_ssn,
+mp_sccp_cfg[0].sio,
mp_sccp_cfg[0].sccp_service_type));
+ f_init_raw(mp_sccp_cfg[0]);
f_sleep(1.0);
f_send_sccp(ts_SCCP_CR('01'O, calling, called));
f_exp_sccp(tr_SCCP_CC('01'O, ?));
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16921
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ied9fbfb9bd35a99205ca13db033dd9ea03d51238
Gerrit-Change-Number: 16921
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: sccp: Modify SCCP_tests to be run against sccp_demo_user in srv mode
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16920 )
Change subject: sccp: Modify SCCP_tests to be run against sccp_demo_user in srv
mode
..
sccp: Modify SCCP_tests to be run against sccp_demo_user in srv mode
It's easier to handle several tests if they are the ones connecting to
the program under tests.
Forthcoming SCCP_Tests_RAW require use of this mode too.
Take the chance to tweak other values which were wrong, in order to have
CR answered correctly with a CC later on.
Related: OS#4343
Change-Id: Ibf99b1546411b9a9b4375b82f1003d93d3c1645d
---
M sccp/SCCP_Tests.cfg
M sccp/SCCP_Tests.default
M sccp/SCCP_Tests.ttcn
3 files changed, 12 insertions(+), 16 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/20/16920/1
diff --git a/sccp/SCCP_Tests.cfg b/sccp/SCCP_Tests.cfg
index 4b7e742..ab69a2d 100644
--- a/sccp/SCCP_Tests.cfg
+++ b/sccp/SCCP_Tests.cfg
@@ -16,4 +16,3 @@
[EXECUTE]
SCCP_Tests.control
-#SCCP_Tests.TC_routing_global_title_crash
diff --git a/sccp/SCCP_Tests.default b/sccp/SCCP_Tests.default
index f837664..a051517 100644
--- a/sccp/SCCP_Tests.default
+++ b/sccp/SCCP_Tests.default
@@ -1,16 +1,10 @@
[LOGGING]
FileMask := LOG_ALL | TTCN_MATCHING | DEBUG_ENCDEC;
-BSSAP.FileMask := LOG_NOTHING;
-"SCCP_Test_M3UA".FileMask := ERROR | WARNING;
-"SCCP_Test_SCCP".FileMask := ERROR | WARNING;
-"IPA-CTRL-IPA".FileMask := ERROR | WARNING;
-mtc.FileMask := ERROR | WARNING;
-
[TESTPORT_PARAMETERS]
*.SCCP_DEMO_USER_VTY.CTRL_MODE := "client"
-*.SCCP_DEMO_USER_VTY.CTRL_HOSTNAME := "127.0.0.1"
-*.SCCP_DEMO_USER_VTY.CTRL_PORTNUM := "2325"
+*.SCCP_DEMO_USER_VTY.CTRL_HOSTNAME := "127.0.0.2"
+*.SCCP_DEMO_USER_VTY.CTRL_PORTNUM := "2324"
*.SCCP_DEMO_USER_VTY.CTRL_LOGIN_SKIPPED := "yes"
*.SCCP_DEMO_USER_VTY.CTRL_DETECT_SERVER_DISCONNECTED := "yes"
*.SCCP_DEMO_USER_VTY.CTRL_READMODE := "buffered"
@@ -20,17 +14,17 @@
[MODULE_PARAMETERS]
M3UA_Emulation.tsp_logVerbose := true;
-M3UA_Emulation.tsp_SCTP_Server_Mode := true;
-M3UA_Emulation.tsp_M3UA_Server_Mode := true;
+M3UA_Emulation.tsp_SCTP_Server_Mode := false;
+M3UA_Emulation.tsp_M3UA_Server_Mode := false;
SCCP_Tests.sccp_cfg := {
{
sccp_service_type := "mtp3_itu",
sctp_addr := { 2905, "127.0.0.1", 2905, "127.0.0.2" },
- own_pc := 185,
- own_ssn := 254,
- peer_pc := 23,
- peer_ssn := 254,
- sio := '83'O,
+ own_pc := 23,
+ own_ssn := 202, /* sscp_test_server.c: SSN_TEST_ECHO */
+ peer_pc := 1,
+ peer_ssn := 202, /* sscp_test_server.c: SSN_TEST_ECHO */
+ sio := '03'O, /* NI=Internal, SCCP */
rctx := 0
}
};
diff --git a/sccp/SCCP_Tests.ttcn b/sccp/SCCP_Tests.ttcn
index e76e9ac..835c934 100644
--- a/sccp/SCCP_Tests.ttcn
+++ b/sccp/SCCP_Tests.ttcn
@@ -2,6 +2,9 @@
* Author: Stefan Sperling
* All Rights Reserved
*
+ * The idea is that these tests are executed against sccp_demo_user from
+ * libosmo-sccp.git in server mode.
+ *
* Released under the terms of GNU General Public License, Version 2 or
* (at your option) any later version.
*
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16920
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ibf99b1546411b9a9b4375b82f1003d93d3c1645d
Gerrit-Change-Number: 16920
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in libosmocore[master]: gsm48_ie.c: Avoid compiler warnings about using deprecated API
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16474 ) Change subject: gsm48_ie.c: Avoid compiler warnings about using deprecated API .. Patch Set 2: Code-Review-1 The mentioned warnings have already been fixed by I1b0eff1396776900c1286e41da3aee3ff78b326e, so there is nothing left to do. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16474 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0e5cd06a70556e624bfed0d52405d232d8296dbc Gerrit-Change-Number: 16474 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jan 2020 16:34:16 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: gsm48_ie.c: Avoid compiler warnings about using deprecated API
laforge has removed a vote from this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16474 ) Change subject: gsm48_ie.c: Avoid compiler warnings about using deprecated API .. Removed Code-Review+2 by laforge -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16474 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0e5cd06a70556e624bfed0d52405d232d8296dbc Gerrit-Change-Number: 16474 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: deleteVote
Change in simtrace2[master]: increase ringbuffer size from 512 to 1024 bytes
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/simtrace2/+/16919 )
Change subject: increase ringbuffer size from 512 to 1024 bytes
..
increase ringbuffer size from 512 to 1024 bytes
As reported in https://osmocom.org/issues/4335, there appear to
be some cards / use cases in which the 512 byte sized ringbuffer is
insufficient. As we do have free RAM available, we can easily
increase the buffer size, despite not entirely knowing yet why
it needs to be *that* large.
Change-Id: Ie713d614ec5b334e9058d5d430e4bb660f5b8b69
Closes: OS#4335
---
M firmware/libcommon/include/ringbuffer.h
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/19/16919/1
diff --git a/firmware/libcommon/include/ringbuffer.h
b/firmware/libcommon/include/ringbuffer.h
index a6eddc9..23aaa59 100644
--- a/firmware/libcommon/include/ringbuffer.h
+++ b/firmware/libcommon/include/ringbuffer.h
@@ -21,7 +21,7 @@
#include
#include
-#define RING_BUFLEN 512
+#define RING_BUFLEN 1024
typedef struct ringbuf {
uint8_t buf[RING_BUFLEN];
--
To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16919
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: simtrace2
Gerrit-Branch: master
Gerrit-Change-Id: Ie713d614ec5b334e9058d5d430e4bb660f5b8b69
Gerrit-Change-Number: 16919
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
Change in osmo-ci[master]: gerrit-verifications: fix erlang/osmo_ss7 name
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16907 ) Change subject: gerrit-verifications: fix erlang/osmo_ss7 name .. Patch Set 2: > Patch Set 2: > > it's a bit late now, but I just realized that the gerrit job names don't have > the 'erlang' part in the name. This can lead to some confusion with other > (C) Osmocom projects, but I guess it's mostly cosmetic. Luckily we don't > have osmo_ss7 in C and in Erlang. I see. If it should become a problem in the future, it should not be much effort to create the jobs with proper names and delete the old ones. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16907 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Id78f7e62e12c7595329ef8a265e522f27a087604 Gerrit-Change-Number: 16907 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 17 Jan 2020 15:31:42 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-ci[master]: gerrit-verifications: fix erlang/osmo_ss7 name
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16907 ) Change subject: gerrit-verifications: fix erlang/osmo_ss7 name .. Patch Set 2: it's a bit late now, but I just realized that the gerrit job names don't have the 'erlang' part in the name. This can lead to some confusion with other (C) Osmocom projects, but I guess it's mostly cosmetic. Luckily we don't have osmo_ss7 in C and in Erlang. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16907 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Id78f7e62e12c7595329ef8a265e522f27a087604 Gerrit-Change-Number: 16907 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 17 Jan 2020 15:27:48 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-ci[master]: gerrit-verifications: fix erlang/osmo_ss7 name
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ci/+/16907 )
Change subject: gerrit-verifications: fix erlang/osmo_ss7 name
..
gerrit-verifications: fix erlang/osmo_ss7 name
Fixes: aadc60f4037dcf9529a30d362648b0f0849825c2
("jobs/gerrit-verifications.yml: add erlang repos")
Related: OS#4345
Change-Id: Id78f7e62e12c7595329ef8a265e522f27a087604
---
M jobs/gerrit-verifications.yml
1 file changed, 5 insertions(+), 5 deletions(-)
Approvals:
osmith: Verified
laforge: Looks good to me, approved
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index 5703bf8..80a3b08 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -198,6 +198,11 @@
-e WITH_MANUALS="$WITH_MANUALS" \
{docker_img} /build/contrib/jenkins.sh
+ - osmo_ss7:
+ repos_url: '{gerrit_url}/erlang/{repos}'
+ gerrit_project: 'erlang/{repos}'
+ cmd: '{docker_run} {docker_img_erlang} /build/contrib/jenkins.sh'
+
- osmo-sip-connector
- osmo-trx:
@@ -228,11 +233,6 @@
concurrent: false
cmd: './contrib/jenkins.sh'
- - ss7:
- repos_url: '{gerrit_url}/erlang/{repos}'
- gerrit_project: 'erlang/{repos}'
- cmd: '{docker_run} {docker_img_erlang} /build/contrib/jenkins.sh'
-
- osmo-ttcn3-hacks:
repos_url: 'https://gerrit.osmocom.org/{repos}'
slave_axis: !!python/tuple [ttcn3]
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16907
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Id78f7e62e12c7595329ef8a265e522f27a087604
Gerrit-Change-Number: 16907
Gerrit-PatchSet: 2
Gerrit-Owner: osmith
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-MessageType: merged
Change in osmo-ci[master]: gerrit-verifications: fix erlang/osmo_ss7 name
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16907 ) Change subject: gerrit-verifications: fix erlang/osmo_ss7 name .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16907 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Id78f7e62e12c7595329ef8a265e522f27a087604 Gerrit-Change-Number: 16907 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 17 Jan 2020 15:27:08 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: usb: Add osmo_libusb_find_matching_dev_{path, serial}
laforge has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmocore/+/16830 )
Change subject: usb: Add osmo_libusb_find_matching_dev_{path,serial}
..
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16830
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I8ff3fb3e1a77e10cb313473480ce5e7673749a93
Gerrit-Change-Number: 16830
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Comment-Date: Fri, 17 Jan 2020 15:25:21 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in libosmocore[master]: gsm48_ie.c: Avoid compiler warnings about using deprecated API
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16474 ) Change subject: gsm48_ie.c: Avoid compiler warnings about using deprecated API .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16474 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0e5cd06a70556e624bfed0d52405d232d8296dbc Gerrit-Change-Number: 16474 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Fri, 17 Jan 2020 15:26:10 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: usb: Add osmo_libusb_find_matching_dev_{path, serial}
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/16830 )
Change subject: usb: Add osmo_libusb_find_matching_dev_{path,serial}
..
usb: Add osmo_libusb_find_matching_dev_{path,serial}
Thise two helper functions allow the user application to find
a unique match among the existing USB devices, using either a user-
provided iSerial string, or a user-provided physical USB path.
Change-Id: I8ff3fb3e1a77e10cb313473480ce5e7673749a93
---
M include/osmocom/usb/libusb.h
M src/usb/osmo_libusb.c
2 files changed, 154 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/include/osmocom/usb/libusb.h b/include/osmocom/usb/libusb.h
index 382c86e..2220e03 100644
--- a/include/osmocom/usb/libusb.h
+++ b/include/osmocom/usb/libusb.h
@@ -62,6 +62,14 @@
libusb_device **osmo_libusb_find_matching_usb_devs(void *ctx, struct
libusb_context *luctx,
const struct dev_id
*dev_ids);
+libusb_device *osmo_libusb_find_matching_dev_path(struct libusb_context *luctx,
+ const struct dev_id *dev_ids,
+ const char *path);
+
+libusb_device *osmo_libusb_find_matching_dev_serial(struct libusb_context
*luctx,
+ const struct dev_id
*dev_ids,
+ const char *serial);
+
int osmo_libusb_dev_find_matching_interfaces(libusb_device *dev, int class,
int sub_class,
int protocol, struct
usb_interface_match *out,
unsigned int out_len);
diff --git a/src/usb/osmo_libusb.c b/src/usb/osmo_libusb.c
index b10f5be..9ad6240 100644
--- a/src/usb/osmo_libusb.c
+++ b/src/usb/osmo_libusb.c
@@ -220,6 +220,152 @@
return out;
}
+/*! Find a USB device of matching VendorID/ProductID at given path.
+ * \param[in] luctx libusb context on which to operate
+ * \param[in] dev_ids zer-oterminated array of VendorId/ProductId tuples
+ * \param[in] path string representation of USB path
+ * \returns libusb_device if there was exactly one match; NULL otherwise */
+libusb_device *osmo_libusb_find_matching_dev_path(struct libusb_context *luctx,
+ const struct dev_id *dev_ids,
+ const char *path)
+{
+ libusb_device **list;
+ libusb_device *match = NULL;
+ unsigned int i;
+ int rc;
+
+ rc = libusb_get_device_list(luctx, );
+ if (rc <= 0)
+ return NULL;
+
+ for (i = 0; list[i] != NULL; i++) {
+ struct libusb_device_descriptor dev_desc;
+ libusb_device *dev = list[i];
+ char pathbuf[128];
+
+ rc = libusb_get_device_descriptor(dev, _desc);
+ if (rc < 0) {
+ LOGP(DLUSB, LOGL_ERROR, "couldn't get device
descriptor\n");
+ continue;
+ }
+
+ /* check if device doesn't match */
+ if (!match_dev_ids(_desc, dev_ids))
+ continue;
+
+ /* check if path doesn't match */
+ if (path) {
+ osmo_libusb_dev_get_path_buf(pathbuf, sizeof(pathbuf),
dev);
+ if (strcmp(pathbuf, path))
+ continue;
+ }
+
+ if (match) {
+ /* we already have a match, but now found a second ->
FAIL */
+ libusb_free_device_list(list, 1);
+ LOGP(DLUSB, LOGL_ERROR, "Found more than one matching
USB device\n");
+ return NULL;
+ } else
+ match = dev;
+ }
+
+ if (!match) {
+ /* no match: free the list with automatic unref of all devices
*/
+ libusb_free_device_list(list, 1);
+ return NULL;
+ }
+
+ /* unref all devices *except* the match we found */
+ for (i = 0; list[i] != NULL; i++) {
+ libusb_device *dev = list[i];
+ if (dev != match)
+ libusb_unref_device(dev);
+ }
+ /* free the list *without* automatic unref of all devices */
+ libusb_free_device_list(list, 0);
+ return match;
+}
+
+/*! Find a USB device of matching VendorID/ProductID and given iSerial string.
+ * \param[in] luctx libusb context on which to operate
+ * \param[in] dev_ids zer-oterminated array of VendorId/ProductId tuples
+ * \param[in] serial string representation of serial number
+ * \returns libusb_device if there was exactly one match; NULL otherwise */
+libusb_device *osmo_libusb_find_matching_dev_serial(struct
Change in libosmo-sccp[master]: sccp2sua.c: Log malformed SUA message
pespin has submitted this change. (
https://gerrit.osmocom.org/c/libosmo-sccp/+/16916 )
Change subject: sccp2sua.c: Log malformed SUA message
..
sccp2sua.c: Log malformed SUA message
Change-Id: Ie04371d27426011e1a1a4f9136e0b28bf33df03b
---
M src/sccp2sua.c
1 file changed, 4 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/src/sccp2sua.c b/src/sccp2sua.c
index 2be27ea..92a3907 100644
--- a/src/sccp2sua.c
+++ b/src/sccp2sua.c
@@ -1468,8 +1468,11 @@
goto out_err;
}
- if (rc < 0)
+ if (rc < 0) {
+ LOGP(DLSUA, LOGL_ERROR, "Malformed SUA message %s\n",
+ xua_hdr_dump(xua, _dialect_sua));
goto out_err;
+ }
return msg;
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16916
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: Ie04371d27426011e1a1a4f9136e0b28bf33df03b
Gerrit-Change-Number: 16916
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: MSC: fix TC_iu_cmserv_imsi_unknown: do not call f_mm_auth()
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16889 ) Change subject: MSC: fix TC_iu_cmserv_imsi_unknown: do not call f_mm_auth() .. Patch Set 1: I think the problem is that somebody modified the test beyond what it originally intended to do. As the comment states, it is about an "IMSI that has never performed a LU before" (i.e. IMSI unknown to the VLR). It doesn't state that this IMSI is unknown to the HLR and hence should be rejected. That probably also explains the commented-out LU accept line in the test... -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16889 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I26fe18093e49bc9f53ac0234338c2b5cf9e4f07c Gerrit-Change-Number: 16889 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 17 Jan 2020 15:23:30 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in libosmo-sccp[master]: sccp: Log missing user and router failure paths
pespin has submitted this change. (
https://gerrit.osmocom.org/c/libosmo-sccp/+/16918 )
Change subject: sccp: Log missing user and router failure paths
..
sccp: Log missing user and router failure paths
Change-Id: I36374e4419474c5ab43c9cca1b59f3054f93180b
---
M src/sccp_scoc.c
M src/sccp_scrc.c
2 files changed, 6 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c
index 7570764..b5b6547 100644
--- a/src/sccp_scoc.c
+++ b/src/sccp_scoc.c
@@ -1364,6 +1364,9 @@
uint32_t conn_id;
struct sccp_connection *conn;
+ LOGP(DLSCCP, LOGL_NOTICE, "SCRC Routing Failure for message %s\n",
+xua_hdr_dump(xua, _dialect_sua));
+
/* try to dispatch to connection FSM (if any) */
conn_id = xua_msg_get_u32(xua, SUA_IEI_DEST_REF);
conn = conn_find_by_id(inst, conn_id);
diff --git a/src/sccp_scrc.c b/src/sccp_scrc.c
index e259d7c..b46b4f2 100644
--- a/src/sccp_scrc.c
+++ b/src/sccp_scrc.c
@@ -321,6 +321,9 @@
/* Is subsystem equipped? */
if (!scu) {
/* Error: unequipped user */
+ LOGP(DLSCCP, LOGL_NOTICE,
+"Unable to find user for SSN=%u PC=%s\n",
+called->ssn, osmo_ss7_pointcode_print(inst->ss7,
called->pc));
return scrc_node_4(inst, xua,
SCCP_RETURN_CAUSE_UNEQUIPPED_USER);
}
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16918
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: I36374e4419474c5ab43c9cca1b59f3054f93180b
Gerrit-Change-Number: 16918
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-ci[master]: gerrit-verifications: fix erlang/osmo_ss7 name
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16907 ) Change subject: gerrit-verifications: fix erlang/osmo_ss7 name .. Patch Set 2: Verified+1 rebased on master to fix the "merge conflict" that gerrit showed -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16907 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Id78f7e62e12c7595329ef8a265e522f27a087604 Gerrit-Change-Number: 16907 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 17 Jan 2020 15:22:41 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmo-sccp[master]: sccp: Support receiving messages with no optional params
pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16902 ) Change subject: sccp: Support receiving messages with no optional params .. sccp: Support receiving messages with no optional params Change-Id: I745bd32c62763ba2d88e74de8644c171ef506b37 --- M src/sccp2sua.c 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/src/sccp2sua.c b/src/sccp2sua.c index b829cf6..2be27ea 100644 --- a/src/sccp2sua.c +++ b/src/sccp2sua.c @@ -705,6 +705,12 @@ /* some bounds checking */ if (ptr_opt < msg->data || ptr_opt > msg->tail) return NULL; + + /* Q.713 section 2.3 "Coding of pointers": pointer value all zeros used + to indicate that no optional param is present. */ + if (*ptr_opt == 0) + return xua; + opt_start = ptr_opt + *ptr_opt; if (opt_start > msg->tail) return NULL; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16902 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I745bd32c62763ba2d88e74de8644c171ef506b37 Gerrit-Change-Number: 16902 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmocom-bb[master]: logging: use meaningful default loglevels
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16892 ) Change subject: logging: use meaningful default loglevels .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3faefccae2218b17bd942bc2afac7d8e515897b7 Gerrit-Change-Number: 16892 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 17 Jan 2020 15:21:16 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo_gsup[master]: contrib/jenkins.sh: new file
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16903 ) Change subject: contrib/jenkins.sh: new file .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16903 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_gsup Gerrit-Branch: master Gerrit-Change-Id: Ifa6c846ec002ad748185ba5da7108a67a9367786 Gerrit-Change-Number: 16903 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 17 Jan 2020 15:20:41 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo_gsup[master]: contrib/jenkins.sh: new file
laforge has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16903 ) Change subject: contrib/jenkins.sh: new file .. contrib/jenkins.sh: new file Related: OS#4345 Change-Id: Ifa6c846ec002ad748185ba5da7108a67a9367786 --- A contrib/jenkins.sh 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh new file mode 100755 index 000..bc676c6 --- /dev/null +++ b/contrib/jenkins.sh @@ -0,0 +1,4 @@ +#!/bin/sh -ex + +rebar3 compile +rebar3 eunit -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16903 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_gsup Gerrit-Branch: master Gerrit-Change-Id: Ifa6c846ec002ad748185ba5da7108a67a9367786 Gerrit-Change-Number: 16903 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in ...osmo_ss7[master]: contrib/jenkins.sh: new file
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/16905 ) Change subject: contrib/jenkins.sh: new file .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/16905 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_ss7 Gerrit-Branch: master Gerrit-Change-Id: Ib20eb2e6d18a5b91ba3f042a70acb132256e9d26 Gerrit-Change-Number: 16905 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 17 Jan 2020 15:20:34 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo_ss7[master]: contrib/jenkins.sh: new file
laforge has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/16905 ) Change subject: contrib/jenkins.sh: new file .. contrib/jenkins.sh: new file Related: OS#4345 Change-Id: Ib20eb2e6d18a5b91ba3f042a70acb132256e9d26 --- A contrib/jenkins.sh 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh new file mode 100755 index 000..bc676c6 --- /dev/null +++ b/contrib/jenkins.sh @@ -0,0 +1,4 @@ +#!/bin/sh -ex + +rebar3 compile +rebar3 eunit -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/16905 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_ss7 Gerrit-Branch: master Gerrit-Change-Id: Ib20eb2e6d18a5b91ba3f042a70acb132256e9d26 Gerrit-Change-Number: 16905 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in libosmo-sccp[master]: sccp: Support receiving messages with no optional params
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16902 ) Change subject: sccp: Support receiving messages with no optional params .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16902 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I745bd32c62763ba2d88e74de8644c171ef506b37 Gerrit-Change-Number: 16902 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jan 2020 15:19:36 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmo-sccp[master]: sccp: Improve logging in sccp_to_xua_opt()
pespin has submitted this change. (
https://gerrit.osmocom.org/c/libosmo-sccp/+/16901 )
Change subject: sccp: Improve logging in sccp_to_xua_opt()
..
sccp: Improve logging in sccp_to_xua_opt()
Change-Id: Icb3f18f34ecfe0602c6e491b61107a30287dcafb
---
M include/osmocom/sccp/sccp_types.h
M src/sccp2sua.c
M src/sccp_types.c
3 files changed, 40 insertions(+), 5 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/include/osmocom/sccp/sccp_types.h
b/include/osmocom/sccp/sccp_types.h
index 71cbb0f..f43f822 100644
--- a/include/osmocom/sccp/sccp_types.h
+++ b/include/osmocom/sccp/sccp_types.h
@@ -80,6 +80,10 @@
SCCP_PNC_LONG_DATA = 19,
};
+extern const struct value_string osmo_sccp_pnc_names[];
+static inline const char *osmo_sccp_pnc_name(enum sccp_message_types val)
+{ return get_value_string(osmo_sccp_pnc_names, val); }
+
/* Figure 3/Q.713 Called/calling party address */
enum {
SCCP_TITLE_IND_NONE = 0,
diff --git a/src/sccp2sua.c b/src/sccp2sua.c
index e68662f..b829cf6 100644
--- a/src/sccp2sua.c
+++ b/src/sccp2sua.c
@@ -711,10 +711,11 @@
oneopt = opt_start;
+ enum sccp_parameter_name_codes opt_type = 0; /* dummy value not used */
while (oneopt < msg->tail) {
- enum sccp_parameter_name_codes opt_type = oneopt[0];
uint8_t opt_len;
uint16_t opt_len16;
+ opt_type = oneopt[0];
switch (opt_type) {
case SCCP_PNC_END_OF_OPTIONAL:
@@ -722,25 +723,30 @@
case SCCP_PNC_LONG_DATA:
/* two byte length field */
if (oneopt + 2 > msg->tail)
- return NULL;
+ goto malformed;
opt_len16 = oneopt[1] << 8 | oneopt[2];
if (oneopt + 3 + opt_len16 > msg->tail)
- return NULL;
+ goto malformed;
xua_msg_add_sccp_opt(xua, opt_type, opt_len16,
oneopt+3);
oneopt += 3 + opt_len16;
break;
default:
/* one byte length field */
if (oneopt + 1 > msg->tail)
- return NULL;
+ goto malformed;
opt_len = oneopt[1];
if (oneopt + 2 + opt_len > msg->tail)
- return NULL;
+ goto malformed;
xua_msg_add_sccp_opt(xua, opt_type, opt_len, oneopt+2);
oneopt += 2 + opt_len;
}
}
+ LOGP(DLSUA, LOGL_ERROR, "Parameter %s not found\n",
osmo_sccp_pnc_name(SCCP_PNC_END_OF_OPTIONAL));
+ return NULL;
+
+malformed:
+ LOGP(DLSUA, LOGL_ERROR, "Malformed parameter %s (%d)\n",
osmo_sccp_pnc_name(opt_type), opt_type);
return NULL;
}
diff --git a/src/sccp_types.c b/src/sccp_types.c
index c6e24cc..98b3fa4 100644
--- a/src/sccp_types.c
+++ b/src/sccp_types.c
@@ -24,3 +24,28 @@
{ SCCP_MSG_TYPE_LUDTS, "Long unitdata service" },
{}
};
+
+/* Table 2/Q.713 - SCCP parameter name codes */
+const struct value_string osmo_sccp_pnc_names[] = {
+ { SCCP_PNC_END_OF_OPTIONAL, "End of optional parameters" },
+ { SCCP_PNC_DESTINATION_LOCAL_REFERENCE, "Destination local reference" },
+ { SCCP_PNC_SOURCE_LOCAL_REFERENCE, "Source local reference" },
+ { SCCP_PNC_CALLED_PARTY_ADDRESS, "Called party address" },
+ { SCCP_PNC_CALLING_PARTY_ADDRESS, "Calling party address" },
+ { SCCP_PNC_PROTOCOL_CLASS, "Protocol class" },
+ { SCCP_PNC_SEGMENTING, "Segmenting/reassembling" },
+ { SCCP_PNC_RECEIVE_SEQ_NUMBER, "Receive sequence number" },
+ { SCCP_PNC_SEQUENCING, "Sequencing/segmenting" },
+ { SCCP_PNC_CREDIT, "Credit" },
+ { SCCP_PNC_RELEASE_CAUSE, "Release cause" },
+ { SCCP_PNC_RETURN_CAUSE, "Return cause" },
+ { SCCP_PNC_RESET_CAUSE, "Reset cause" },
+ { SCCP_PNC_ERROR_CAUSE, "Error cause" },
+ { SCCP_PNC_REFUSAL_CAUSE, "Refusal cause" },
+ { SCCP_PNC_DATA, "Data" },
+ { SCCP_PNC_SEGMENTATION, "Segmentation" },
+ { SCCP_PNC_HOP_COUNTER, "Hop counter" },
+ { SCCP_PNC_IMPORTANCE, "Importance" },
+ { SCCP_PNC_LONG_DATA, "Long data" },
+ {}
+};
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16901
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: Icb3f18f34ecfe0602c6e491b61107a30287dcafb
Gerrit-Change-Number: 16901
Gerrit-PatchSet: 3
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Change in libosmo-sccp[master]: sccp: Convert ifelse to switch statement
pespin has submitted this change. (
https://gerrit.osmocom.org/c/libosmo-sccp/+/16900 )
Change subject: sccp: Convert ifelse to switch statement
..
sccp: Convert ifelse to switch statement
Change-Id: I1f3129f5b949fc70913e8103ef17c696002b8ed2
---
M src/sccp2sua.c
1 file changed, 8 insertions(+), 7 deletions(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, approved
laforge: Looks good to me, but someone else must approve
diff --git a/src/sccp2sua.c b/src/sccp2sua.c
index 1106888..e68662f 100644
--- a/src/sccp2sua.c
+++ b/src/sccp2sua.c
@@ -712,13 +712,14 @@
oneopt = opt_start;
while (oneopt < msg->tail) {
- uint8_t opt_type = oneopt[0];
+ enum sccp_parameter_name_codes opt_type = oneopt[0];
+ uint8_t opt_len;
+ uint16_t opt_len16;
- if (opt_type == SCCP_PNC_END_OF_OPTIONAL)
+ switch (opt_type) {
+ case SCCP_PNC_END_OF_OPTIONAL:
return xua;
-
- if (opt_type == SCCP_PNC_LONG_DATA) {
- uint16_t opt_len16;
+ case SCCP_PNC_LONG_DATA:
/* two byte length field */
if (oneopt + 2 > msg->tail)
return NULL;
@@ -727,8 +728,8 @@
return NULL;
xua_msg_add_sccp_opt(xua, opt_type, opt_len16,
oneopt+3);
oneopt += 3 + opt_len16;
- } else {
- uint8_t opt_len;
+ break;
+ default:
/* one byte length field */
if (oneopt + 1 > msg->tail)
return NULL;
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16900
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: I1f3129f5b949fc70913e8103ef17c696002b8ed2
Gerrit-Change-Number: 16900
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in libosmo-sccp[master]: sccp: Convert ifelse to switch statement
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16900 ) Change subject: sccp: Convert ifelse to switch statement .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16900 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I1f3129f5b949fc70913e8103ef17c696002b8ed2 Gerrit-Change-Number: 16900 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jan 2020 15:12:21 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: gerrit-verification: fix erlang cmd
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16904 ) Change subject: gerrit-verification: fix erlang cmd .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16904 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I6e121c79ecf872a7058de3a6dc0a940fa8091f68 Gerrit-Change-Number: 16904 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 17 Jan 2020 15:03:07 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: gerrit-verification: fix erlang cmd
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ci/+/16904 )
Change subject: gerrit-verification: fix erlang cmd
..
gerrit-verification: fix erlang cmd
Jenkins job builder only does one pass of variable substitution. Replace
the cmd_erlang variable with its contents, so the jobs don't fail with:
[osmocom-gerrit-debian9] $ /bin/sh -xe /tmp/jenkins7189809471369692535.sh
+ {docker_run} {docker_img_erlang} /build/contrib/jenkins.sh
/tmp/jenkins7189809471369692535.sh: 2: /tmp/jenkins7189809471369692535.sh:
{docker_run}: not found
Fixes: aadc60f4037dcf9529a30d362648b0f0849825c2
("jobs/gerrit-verifications.yml: add erlang repos")
Related: OS#4345
Change-Id: I6e121c79ecf872a7058de3a6dc0a940fa8091f68
---
M jobs/gerrit-verifications.yml
1 file changed, 3 insertions(+), 4 deletions(-)
Approvals:
laforge: Looks good to me, approved
osmith: Verified
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index 8846e31..5703bf8 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -43,7 +43,6 @@
docker_img: '$USER/debian-stretch-jenkins'
docker_img_erlang: '$USER/debian-buster-erlang'
cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh'
-cmd_erlang: '{docker_run} {docker_img_erlang} /build/contrib/jenkins.sh'
gerrit_url: 'ssh://jenk...@gerrit.osmocom.org:29418'
repos_url: '{gerrit_url}/{repos}'
gerrit_project: '{repos}'
@@ -114,7 +113,7 @@
- osmo_dia2gsup:
repos_url: '{gerrit_url}/erlang/{repos}'
gerrit_project: 'erlang/{repos}'
- cmd: '{cmd_erlang}'
+ cmd: '{docker_run} {docker_img_erlang} /build/contrib/jenkins.sh'
- osmo-ggsn:
a1_name: GTP
@@ -135,7 +134,7 @@
- osmo_gsup:
repos_url: '{gerrit_url}/erlang/{repos}'
gerrit_project: 'erlang/{repos}'
- cmd: '{cmd_erlang}'
+ cmd: '{docker_run} {docker_img_erlang} /build/contrib/jenkins.sh'
- osmo-hlr
- osmo-iuh
@@ -232,7 +231,7 @@
- ss7:
repos_url: '{gerrit_url}/erlang/{repos}'
gerrit_project: 'erlang/{repos}'
- cmd: '{cmd_erlang}'
+ cmd: '{docker_run} {docker_img_erlang} /build/contrib/jenkins.sh'
- osmo-ttcn3-hacks:
repos_url: 'https://gerrit.osmocom.org/{repos}'
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16904
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I6e121c79ecf872a7058de3a6dc0a940fa8091f68
Gerrit-Change-Number: 16904
Gerrit-PatchSet: 2
Gerrit-Owner: osmith
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-MessageType: merged
Change in ...osmo_dia2gsup[master]: contrib/jenkins.sh: new file
laforge has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/16906 ) Change subject: contrib/jenkins.sh: new file .. contrib/jenkins.sh: new file Related: OS#4345 Change-Id: I688b71271fe80b4ec05304e9ed8abc8707cb7b58 --- A contrib/jenkins.sh 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh new file mode 100755 index 000..bc676c6 --- /dev/null +++ b/contrib/jenkins.sh @@ -0,0 +1,4 @@ +#!/bin/sh -ex + +rebar3 compile +rebar3 eunit -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/16906 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: I688b71271fe80b4ec05304e9ed8abc8707cb7b58 Gerrit-Change-Number: 16906 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in ...osmo_dia2gsup[master]: contrib/jenkins.sh: new file
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/16906 ) Change subject: contrib/jenkins.sh: new file .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/16906 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: I688b71271fe80b4ec05304e9ed8abc8707cb7b58 Gerrit-Change-Number: 16906 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 17 Jan 2020 15:02:37 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: osmocom-release-tarballs: publish with rsync
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16917 ) Change subject: osmocom-release-tarballs: publish with rsync .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16917 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I5f88ae0c483ed03c42c47d1cd207ac2722cfa083 Gerrit-Change-Number: 16917 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 17 Jan 2020 14:59:46 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: osmocom-release-tarballs: publish with rsync
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16917 ) Change subject: osmocom-release-tarballs: publish with rsync .. osmocom-release-tarballs: publish with rsync Related: OS#3870 Change-Id: I5f88ae0c483ed03c42c47d1cd207ac2722cfa083 --- M jobs/osmocom-release-tarballs.yml 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: osmith: Verified laforge: Looks good to me, approved diff --git a/jobs/osmocom-release-tarballs.yml b/jobs/osmocom-release-tarballs.yml index 56f5777..fd078be 100644 --- a/jobs/osmocom-release-tarballs.yml +++ b/jobs/osmocom-release-tarballs.yml @@ -10,6 +10,8 @@ defaults: global description: | For each relevant Osmocom repository and its tags, build release tarballs (https://osmocom.org/issues/3870;>OS#3870). + +Publishes to: https://ftp.osmocom.org/releases/;>https://ftp.osmocom.org/releases parameters: - string: name: BRANCH_OSMO_CI @@ -33,6 +35,10 @@ -w /osmo-ci \ -e KEEP_TEMP="$KEEP_TEMP" \ "$USER/debian-stretch-build-dist" /osmo-ci/scripts/osmocom-release-tarballs.sh + + SSH_COMMAND="ssh -p 48" + cd _release_tarballs + rsync -avz --delete -e "$SSH_COMMAND" . relea...@rita.osmocom.org:web-files/ scm: - git: branches: @@ -50,5 +56,9 @@ - email: notify-every-unstable-build: true recipients: 'jenkins-notificati...@lists.osmocom.org' +wrappers: + - ssh-agent-credentials: + users: + - releases # vim: expandtab tabstop=2 shiftwidth=2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16917 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I5f88ae0c483ed03c42c47d1cd207ac2722cfa083 Gerrit-Change-Number: 16917 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged
Change in libosmo-sccp[master]: sccp: Log missing user and router failure paths
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16918 ) Change subject: sccp: Log missing user and router failure paths .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I36374e4419474c5ab43c9cca1b59f3054f93180b Gerrit-Change-Number: 16918 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 17 Jan 2020 14:59:29 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmo-sccp[master]: sccp: Improve logging in sccp_to_xua_opt()
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16901 ) Change subject: sccp: Improve logging in sccp_to_xua_opt() .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16901 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Icb3f18f34ecfe0602c6e491b61107a30287dcafb Gerrit-Change-Number: 16901 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 17 Jan 2020 14:58:58 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmo-sccp[master]: sccp: Add value_string for SCCP message types
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16896 ) Change subject: sccp: Add value_string for SCCP message types .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16896 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ibf3ee4be88a4ca633a01fad08d4c714bfa9008bc Gerrit-Change-Number: 16896 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 17 Jan 2020 14:58:33 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmo-sccp[master]: examples/sccp_test_server.c: Fix typo in log message
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmo-sccp/+/16898 )
Change subject: examples/sccp_test_server.c: Fix typo in log message
..
examples/sccp_test_server.c: Fix typo in log message
Change-Id: I8456893b77624402645728ce9403847065a662eb
---
M examples/sccp_test_server.c
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/examples/sccp_test_server.c b/examples/sccp_test_server.c
index 6249e45..a66cb21 100644
--- a/examples/sccp_test_server.c
+++ b/examples/sccp_test_server.c
@@ -87,7 +87,7 @@
switch (OSMO_PRIM_HDR(_prim->oph)) {
case OSMO_PRIM(OSMO_SCU_PRIM_N_UNITDATA, PRIM_OP_INDICATION):
- printf("%s: N-UNITDATA.ind: Connectiong back to sender\n",
__func__);
+ printf("%s: N-UNITDATA.ind: Connecting back to sender\n",
__func__);
osmo_sccp_tx_conn_req(scu, conn_id++,
_prim->u.unitdata.called_addr,
_prim->u.unitdata.calling_addr,
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16898
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: I8456893b77624402645728ce9403847065a662eb
Gerrit-Change-Number: 16898
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in libosmo-sccp[master]: sccp: Avoid memleak of xua_msg receiving malformed sccp message
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmo-sccp/+/16897 )
Change subject: sccp: Avoid memleak of xua_msg receiving malformed sccp message
..
sccp: Avoid memleak of xua_msg receiving malformed sccp message
first, xua_msg is allocated internally in the function. Then depending
on msg type different functions are called. All of those functions
either return the same input xua msg pointer or NULL. If they return
NULL due to parsing failure, we need to free the internally allocated
xua pointer.
Change-Id: I4189fbd66e7e05ce466b3e716a357c56d788b64c
---
M src/sccp2sua.c
1 file changed, 49 insertions(+), 10 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/src/sccp2sua.c b/src/sccp2sua.c
index 7e6b3a3..1106888 100644
--- a/src/sccp2sua.c
+++ b/src/sccp2sua.c
@@ -998,6 +998,7 @@
local_ref->octet3 = tmp32 & 0xff;
}
+/*! \returns \ref xua in case of success, NULL on error (xua not freed!) */
static struct xua_msg *sccp_to_xua_cr(struct msgb *msg, struct xua_msg *xua)
{
struct sccp_connection_request *req = (struct sccp_connection_request
*)msg->l2h;
@@ -1013,6 +1014,7 @@
return sccp_to_xua_opt(msg, >optional_start, xua);
}
+/*! \returns \ref xua in case of success, NULL on error (xua not freed!) */
static int sua_to_sccp_cr(struct msgb *msg, struct xua_msg *xua)
{
struct sccp_connection_request *req;
@@ -1029,6 +1031,7 @@
return xua_ies_to_sccp_opts(msg, >optional_start, req->type, xua);
}
+/*! \returns \ref xua in case of success, NULL on error (xua not freed!) */
static struct xua_msg *sccp_to_xua_cc(struct msgb *msg, struct xua_msg *xua)
{
struct sccp_connection_confirm *cnf = (struct sccp_connection_confirm
*)msg->l2h;
@@ -1041,6 +1044,7 @@
return sccp_to_xua_opt(msg, >optional_start, xua);
}
+/*! \returns \ref xua in case of success, NULL on error (xua not freed!) */
static int sua_to_sccp_cc(struct msgb *msg, struct xua_msg *xua)
{
struct sccp_connection_confirm *cnf;
@@ -1055,6 +1059,7 @@
return xua_ies_to_sccp_opts(msg, >optional_start, cnf->type, xua);
}
+/*! \returns \ref xua in case of success, NULL on error (xua not freed!) */
static struct xua_msg *sccp_to_xua_cref(struct msgb *msg, struct xua_msg *xua)
{
struct sccp_connection_refused *ref = (struct sccp_connection_refused
*)msg->l2h;
@@ -1066,6 +1071,7 @@
return sccp_to_xua_opt(msg, >optional_start, xua);
}
+/*! \returns \ref xua in case of success, NULL on error (xua not freed!) */
static int sua_to_sccp_cref(struct msgb *msg, struct xua_msg *xua)
{
struct sccp_connection_refused *ref;
@@ -1079,6 +1085,7 @@
return xua_ies_to_sccp_opts(msg, >optional_start, ref->type, xua);
}
+/*! \returns \ref xua in case of success, NULL on error (xua not freed!) */
static struct xua_msg *sccp_to_xua_rlsd(struct msgb *msg, struct xua_msg *xua)
{
struct sccp_connection_released *rlsd = (struct
sccp_connection_released *)msg->l2h;
@@ -1106,6 +1113,7 @@
return xua_ies_to_sccp_opts(msg, >optional_start, rlsd->type,
xua);
}
+/*! \returns \ref xua in case of success, NULL on error (xua not freed!) */
static struct xua_msg *sccp_to_xua_rlc(struct msgb *msg, struct xua_msg *xua)
{
struct sccp_connection_release_complete *rlc;
@@ -1129,6 +1137,7 @@
return 0;
}
+/*! \returns \ref xua in case of success, NULL on error (xua not freed!) */
static struct xua_msg *sccp_to_xua_dt1(struct msgb *msg, struct xua_msg *xua)
{
struct sccp_data_form1 *dt1 = (struct sccp_data_form1 *) msg->l2h;
@@ -1157,6 +1166,7 @@
return 0;
}
+/*! \returns \ref xua in case of success, NULL on error (xua not freed!) */
static struct xua_msg *sccp_to_xua_udt(struct msgb *msg, struct xua_msg *xua)
{
struct sccp_data_unitdata *udt = (struct sccp_data_unitdata *)msg->l2h;
@@ -1192,6 +1202,7 @@
return 0;
}
+/*! \returns \ref xua in case of success, NULL on error (xua not freed!) */
static struct xua_msg *sccp_to_xua_udts(struct msgb *msg, struct xua_msg *xua)
{
struct sccp_data_unitdata_service *udts;
@@ -1228,6 +1239,7 @@
return 0;
}
+/*! \returns \ref xua in case of success, NULL on error (xua not freed!) */
static struct xua_msg *sccp_to_xua_it(struct msgb *msg, struct xua_msg *xua)
{
struct sccp_data_it *it = (struct sccp_data_it *)msg->l2h;
@@ -1261,6 +1273,7 @@
return 0;
}
+/*! \returns \ref xua in case of success, NULL on error (xua not freed!) */
static struct xua_msg *sccp_to_xua_err(struct msgb *msg, struct xua_msg *xua)
{
struct sccp_proto_err *err = (struct sccp_proto_err *)msg->l2h;
@@ -1302,34 +1315,54 @@
switch (msg->l2h[0]) {
case SCCP_MSG_TYPE_CR:
xua->hdr = XUA_HDR(SUA_MSGC_CO, SUA_CO_CORE);
- return sccp_to_xua_cr(msg, xua);
+
Change in libosmo-sccp[master]: sccp: Add value_string for SCCP message types
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmo-sccp/+/16896 )
Change subject: sccp: Add value_string for SCCP message types
..
sccp: Add value_string for SCCP message types
Change-Id: Ibf3ee4be88a4ca633a01fad08d4c714bfa9008bc
---
M include/osmocom/sccp/sccp_types.h
M src/Makefile.am
M src/sccp2sua.c
A src/sccp_types.c
4 files changed, 36 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/include/osmocom/sccp/sccp_types.h
b/include/osmocom/sccp/sccp_types.h
index 18b54f4..71cbb0f 100644
--- a/include/osmocom/sccp/sccp_types.h
+++ b/include/osmocom/sccp/sccp_types.h
@@ -26,6 +26,7 @@
#include
#include
+#include
/* Table 1/Q.713 - SCCP message types */
enum sccp_message_types {
@@ -51,6 +52,10 @@
SCCP_MSG_TYPE_LUDTS = 20
};
+extern const struct value_string osmo_sccp_msg_type_names[];
+static inline const char *osmo_sccp_msg_type_name(enum sccp_message_types val)
+{ return get_value_string(osmo_sccp_msg_type_names, val); }
+
/* Table 2/Q.713 - SCCP parameter name codes */
enum sccp_parameter_name_codes {
SCCP_PNC_END_OF_OPTIONAL= 0,
diff --git a/src/Makefile.am b/src/Makefile.am
index 4ef753c..484886c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,7 +29,7 @@
libosmo_sigtran_la_SOURCES = sccp_sap.c sua.c m3ua.c xua_msg.c sccp_helpers.c \
sccp2sua.c sccp_scrc.c sccp_sclc.c sccp_scoc.c \
-sccp_user.c xua_rkm.c xua_default_lm_fsm.c \
+sccp_user.c sccp_types.c xua_rkm.c
xua_default_lm_fsm.c \
osmo_ss7.c osmo_ss7_hmrt.c xua_asp_fsm.c
xua_as_fsm.c \
osmo_ss7_vty.c sccp_vty.c ipa.c
libosmo_sigtran_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined
-export-symbols-regex '^osmo_'
diff --git a/src/sccp2sua.c b/src/sccp2sua.c
index f68f9a9..7e6b3a3 100644
--- a/src/sccp2sua.c
+++ b/src/sccp2sua.c
@@ -1341,6 +1341,10 @@
case SCCP_MSG_TYPE_XUDTS:
case SCCP_MSG_TYPE_LUDT:
case SCCP_MSG_TYPE_LUDTS:
+ LOGP(DLSUA, LOGL_ERROR, "Unsupported SCCP message %s\n",
+ osmo_sccp_msg_type_name(msg->l2h[0]));
+ xua_msg_free(xua);
+ return NULL;
default:
LOGP(DLSUA, LOGL_ERROR, "Unsupported SCCP message type %u\n",
msg->l2h[0]);
diff --git a/src/sccp_types.c b/src/sccp_types.c
new file mode 100644
index 000..c6e24cc
--- /dev/null
+++ b/src/sccp_types.c
@@ -0,0 +1,26 @@
+#include
+
+/* Table 1/Q.713 - SCCP message types */
+const struct value_string osmo_sccp_msg_type_names[] = {
+ { SCCP_MSG_TYPE_CR, "Connection request" },
+ { SCCP_MSG_TYPE_CC, "Connection confirm" },
+ { SCCP_MSG_TYPE_CREF, "Connection refused" },
+ { SCCP_MSG_TYPE_RLSD, "Released" },
+ { SCCP_MSG_TYPE_RLC, "Release complete" },
+ { SCCP_MSG_TYPE_DT1, "Data form 1" },
+ { SCCP_MSG_TYPE_DT2, "Data form 2" },
+ { SCCP_MSG_TYPE_AK, "Data acknowledgement" },
+ { SCCP_MSG_TYPE_UDT, "Unitdata" },
+ { SCCP_MSG_TYPE_UDTS, "Unitdata service" },
+ { SCCP_MSG_TYPE_ED, "Expedited data" },
+ { SCCP_MSG_TYPE_EA, "Expedited data acknowledgement" },
+ { SCCP_MSG_TYPE_RSR, "Reset request" },
+ { SCCP_MSG_TYPE_RSC, "Reset confirmation" },
+ { SCCP_MSG_TYPE_ERR, "Protocol data unit error" },
+ { SCCP_MSG_TYPE_IT, "Inactivity test" },
+ { SCCP_MSG_TYPE_XUDT, "Extended unitdata" },
+ { SCCP_MSG_TYPE_XUDTS, "Extended unitdata service" },
+ { SCCP_MSG_TYPE_LUDT, "Long unitdata" },
+ { SCCP_MSG_TYPE_LUDTS, "Long unitdata service" },
+ {}
+};
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16896
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: Ibf3ee4be88a4ca633a01fad08d4c714bfa9008bc
Gerrit-Change-Number: 16896
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in libosmo-sccp[master]: sccp2sua.c: Log malformed SUA message
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16916 ) Change subject: sccp2sua.c: Log malformed SUA message .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16916 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ie04371d27426011e1a1a4f9136e0b28bf33df03b Gerrit-Change-Number: 16916 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 17 Jan 2020 14:59:11 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmo-sccp[master]: examples/sccp_demo_user: log category name instead of its hex value
laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16899 ) Change subject: examples/sccp_demo_user: log category name instead of its hex value .. examples/sccp_demo_user: log category name instead of its hex value Change-Id: I57afb4cacdb3c118c7570d924caa23144d192aa8 --- M examples/sccp_demo_user.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/examples/sccp_demo_user.c b/examples/sccp_demo_user.c index 4b7b6bc..8cf3c33 100644 --- a/examples/sccp_demo_user.c +++ b/examples/sccp_demo_user.c @@ -72,6 +72,8 @@ void *tall_ctx = talloc_named_const(NULL, 1, "example"); msgb_talloc_ctx_init(tall_ctx, 0); osmo_init_logging2(tall_ctx, _info); + log_set_print_category(osmo_stderr_target, true); + log_set_print_category_hex(osmo_stderr_target, false); for (i = 0; i < ARRAY_SIZE(log_cats); i++) log_set_category_filter(osmo_stderr_target, log_cats[i], 1, LOGL_DEBUG); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16899 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I57afb4cacdb3c118c7570d924caa23144d192aa8 Gerrit-Change-Number: 16899 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in libosmo-sccp[master]: sccp: Add value_string for SCCP message types
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16896 ) Change subject: sccp: Add value_string for SCCP message types .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16896 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ibf3ee4be88a4ca633a01fad08d4c714bfa9008bc Gerrit-Change-Number: 16896 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 17 Jan 2020 14:58:28 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmo-sccp[master]: sccp: Log missing user and router failure paths
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmo-sccp/+/16918 )
Change subject: sccp: Log missing user and router failure paths
..
sccp: Log missing user and router failure paths
Change-Id: I36374e4419474c5ab43c9cca1b59f3054f93180b
---
M src/sccp_scoc.c
M src/sccp_scrc.c
2 files changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/18/16918/1
diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c
index 7570764..b5b6547 100644
--- a/src/sccp_scoc.c
+++ b/src/sccp_scoc.c
@@ -1364,6 +1364,9 @@
uint32_t conn_id;
struct sccp_connection *conn;
+ LOGP(DLSCCP, LOGL_NOTICE, "SCRC Routing Failure for message %s\n",
+xua_hdr_dump(xua, _dialect_sua));
+
/* try to dispatch to connection FSM (if any) */
conn_id = xua_msg_get_u32(xua, SUA_IEI_DEST_REF);
conn = conn_find_by_id(inst, conn_id);
diff --git a/src/sccp_scrc.c b/src/sccp_scrc.c
index e259d7c..b46b4f2 100644
--- a/src/sccp_scrc.c
+++ b/src/sccp_scrc.c
@@ -321,6 +321,9 @@
/* Is subsystem equipped? */
if (!scu) {
/* Error: unequipped user */
+ LOGP(DLSCCP, LOGL_NOTICE,
+"Unable to find user for SSN=%u PC=%s\n",
+called->ssn, osmo_ss7_pointcode_print(inst->ss7,
called->pc));
return scrc_node_4(inst, xua,
SCCP_RETURN_CAUSE_UNEQUIPPED_USER);
}
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16918
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: I36374e4419474c5ab43c9cca1b59f3054f93180b
Gerrit-Change-Number: 16918
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in osmo-ci[master]: osmocom-release-tarballs: publish with rsync
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16917 ) Change subject: osmocom-release-tarballs: publish with rsync .. Patch Set 1: Verified+1 Uploading works: https://ftp.osmocom.org/releases/ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16917 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I5f88ae0c483ed03c42c47d1cd207ac2722cfa083 Gerrit-Change-Number: 16917 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 17 Jan 2020 14:54:24 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: osmocom-release-tarballs: publish with rsync
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/16917 ) Change subject: osmocom-release-tarballs: publish with rsync .. osmocom-release-tarballs: publish with rsync Related: OS#3870 Change-Id: I5f88ae0c483ed03c42c47d1cd207ac2722cfa083 --- M jobs/osmocom-release-tarballs.yml 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/17/16917/1 diff --git a/jobs/osmocom-release-tarballs.yml b/jobs/osmocom-release-tarballs.yml index 56f5777..fd078be 100644 --- a/jobs/osmocom-release-tarballs.yml +++ b/jobs/osmocom-release-tarballs.yml @@ -10,6 +10,8 @@ defaults: global description: | For each relevant Osmocom repository and its tags, build release tarballs (https://osmocom.org/issues/3870;>OS#3870). + +Publishes to: https://ftp.osmocom.org/releases/;>https://ftp.osmocom.org/releases parameters: - string: name: BRANCH_OSMO_CI @@ -33,6 +35,10 @@ -w /osmo-ci \ -e KEEP_TEMP="$KEEP_TEMP" \ "$USER/debian-stretch-build-dist" /osmo-ci/scripts/osmocom-release-tarballs.sh + + SSH_COMMAND="ssh -p 48" + cd _release_tarballs + rsync -avz --delete -e "$SSH_COMMAND" . relea...@rita.osmocom.org:web-files/ scm: - git: branches: @@ -50,5 +56,9 @@ - email: notify-every-unstable-build: true recipients: 'jenkins-notificati...@lists.osmocom.org' +wrappers: + - ssh-agent-credentials: + users: + - releases # vim: expandtab tabstop=2 shiftwidth=2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16917 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I5f88ae0c483ed03c42c47d1cd207ac2722cfa083 Gerrit-Change-Number: 16917 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
Change in libosmo-sccp[master]: sccp2sua.c: Log malformed SUA message
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmo-sccp/+/16916 )
Change subject: sccp2sua.c: Log malformed SUA message
..
sccp2sua.c: Log malformed SUA message
Change-Id: Ie04371d27426011e1a1a4f9136e0b28bf33df03b
---
M src/sccp2sua.c
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/16/16916/1
diff --git a/src/sccp2sua.c b/src/sccp2sua.c
index 2be27ea..92a3907 100644
--- a/src/sccp2sua.c
+++ b/src/sccp2sua.c
@@ -1468,8 +1468,11 @@
goto out_err;
}
- if (rc < 0)
+ if (rc < 0) {
+ LOGP(DLSUA, LOGL_ERROR, "Malformed SUA message %s\n",
+ xua_hdr_dump(xua, _dialect_sua));
goto out_err;
+ }
return msg;
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16916
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: Ie04371d27426011e1a1a4f9136e0b28bf33df03b
Gerrit-Change-Number: 16916
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: deps: use UDPasp from osmocom github fork
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16913 ) Change subject: deps: use UDPasp from osmocom github fork .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16913 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie7e1c3dbd67dba9079a5768e442faffc936fd7fa Gerrit-Change-Number: 16913 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jan 2020 14:13:00 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: hlr: f_perform_UL: add CnDomain parameter
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16911 ) Change subject: hlr: f_perform_UL: add CnDomain parameter .. Patch Set 2: Code-Review+1 (2 comments) Not a merge blocker, but might be a desirable feature. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16911/2/library/GSUP_Types.ttcn File library/GSUP_Types.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16911/2/library/GSUP_Types.ttcn@498 PS2, Line 498: GSUP_CnDomain dom Since this IE is optional, we should allow passing omit: template (omit) ts_GSUP_UL_REQ dom := omit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16911/2/library/GSUP_Types.ttcn@500 PS2, Line 500: valueof(ts_GSUP_IE_CnDomain(dom)) ... but handling optional IEs here is a bit complicated. You would need a function returning the list of IEs, because you cannot just pass omit to ts_GSUP_IE_CnDomain. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16911 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Idd699f054c9242614b9bea066428293f8b2da9c2 Gerrit-Change-Number: 16911 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jan 2020 14:11:30 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: deps: add titan.ProtocolModules.DNS
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16912 ) Change subject: deps: add titan.ProtocolModules.DNS .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16912 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I89dd528b7934892c5a24209374e8218a95db6ab3 Gerrit-Change-Number: 16912 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jan 2020 14:12:06 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmo-sccp[master]: sccp: Improve logging in sccp_to_xua_opt()
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16901 to look at the new patch set (#3). Change subject: sccp: Improve logging in sccp_to_xua_opt() .. sccp: Improve logging in sccp_to_xua_opt() Change-Id: Icb3f18f34ecfe0602c6e491b61107a30287dcafb --- M include/osmocom/sccp/sccp_types.h M src/sccp2sua.c M src/sccp_types.c 3 files changed, 40 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/01/16901/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16901 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Icb3f18f34ecfe0602c6e491b61107a30287dcafb Gerrit-Change-Number: 16901 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-MessageType: newpatchset
Change in libosmo-sccp[master]: sccp: Add value_string for SCCP message types
Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16896 to look at the new patch set (#2). Change subject: sccp: Add value_string for SCCP message types .. sccp: Add value_string for SCCP message types Change-Id: Ibf3ee4be88a4ca633a01fad08d4c714bfa9008bc --- M include/osmocom/sccp/sccp_types.h M src/Makefile.am M src/sccp2sua.c A src/sccp_types.c 4 files changed, 36 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/96/16896/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16896 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ibf3ee4be88a4ca633a01fad08d4c714bfa9008bc Gerrit-Change-Number: 16896 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset
Change in osmo-ttcn3-hacks[master]: hlr: add TC_MSLookup_mDNS_server
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 ) Change subject: hlr: add TC_MSLookup_mDNS_server .. Patch Set 7: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914/7/library/MSLookup_mDNS_Emulation.ttcn File library/MSLookup_mDNS_Emulation.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914/7/library/MSLookup_mDNS_Emulation.ttcn@16 PS7, Line 16: /* Transcode between mDNS and UDP: > Fine, but TBH I'm still not understanding why is this required. […] It might be possible that we could omit this file completely, and directly use dec_PDU_DNS and enc_PDU_DNS. I've adapted it from the other library/*_Emulation.ttcn files and from the demo code in titan.ProtocolModules.DNS. But then I'm not sure how we would specify the UDP port... In order to not spend too much time on this, I'd just keep it as-is, unless we have a good reason to refactor it. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia7f92d33691f910549353b16a7b0efc18e521719 Gerrit-Change-Number: 16914 Gerrit-PatchSet: 7 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 17 Jan 2020 13:41:37 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: deps: use UDPasp from osmocom github fork
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16913 ) Change subject: deps: use UDPasp from osmocom github fork .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16913 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie7e1c3dbd67dba9079a5768e442faffc936fd7fa Gerrit-Change-Number: 16913 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jan 2020 13:19:47 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: hlr: add TC_MSLookup_mDNS_server
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 ) Change subject: hlr: add TC_MSLookup_mDNS_server .. Patch Set 7: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914/7/library/MSLookup_mDNS_Emulation.ttcn File library/MSLookup_mDNS_Emulation.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914/7/library/MSLookup_mDNS_Emulation.ttcn@16 PS7, Line 16: /* Transcode between mDNS and UDP: Fine, but TBH I'm still not understanding why is this required. What's the different between the "UDP packets" and the "DNS packets" you mention? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia7f92d33691f910549353b16a7b0efc18e521719 Gerrit-Change-Number: 16914 Gerrit-PatchSet: 7 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 17 Jan 2020 13:19:19 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: hlr: add TC_MSLookup_mDNS_server
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 to look at the new patch set (#7). Change subject: hlr: add TC_MSLookup_mDNS_server .. hlr: add TC_MSLookup_mDNS_server Send an mslookup mDNS request to OsmoHLR and verify the answer. Related: SYS#4618 Change-Id: Ia7f92d33691f910549353b16a7b0efc18e521719 --- M hlr/HLR_Tests.cfg M hlr/HLR_Tests.default M hlr/HLR_Tests.ttcn M hlr/gen_links.sh M hlr/regen_makefile.sh A library/MSLookup_mDNS_Emulation.ttcn A library/MSLookup_mDNS_Templates.ttcn A library/MSLookup_mDNS_Types.ttcn 8 files changed, 272 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/14/16914/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia7f92d33691f910549353b16a7b0efc18e521719 Gerrit-Change-Number: 16914 Gerrit-PatchSet: 7 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-MessageType: newpatchset
Change in osmo-ttcn3-hacks[master]: deps: use UDPasp from osmocom github fork
Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16913 to look at the new patch set (#3). Change subject: deps: use UDPasp from osmocom github fork .. deps: use UDPasp from osmocom github fork Has additional SO_REUSEADDR patch, which is needed for D-GSM mslookup mDNS testing. Related: SYS#4618 Change-Id: Ie7e1c3dbd67dba9079a5768e442faffc936fd7fa --- M deps/Makefile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/13/16913/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16913 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie7e1c3dbd67dba9079a5768e442faffc936fd7fa Gerrit-Change-Number: 16913 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-ttcn3-hacks[master]: deps: use UDPasp from osmocom github fork
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16913 ) Change subject: deps: use UDPasp from osmocom github fork .. Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16913/2/deps/Makefile File deps/Makefile: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16913/2/deps/Makefile@a22 PS2, Line 22: titan.ProtocolModules.DNS \ resolving merge conflict went wrong, this should not have been removed. I'll prepare a fixed version. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16913 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie7e1c3dbd67dba9079a5768e442faffc936fd7fa Gerrit-Change-Number: 16913 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jan 2020 12:55:25 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: hlr: add TC_MSLookup_mDNS_server
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 to look at the new patch set (#5). Change subject: hlr: add TC_MSLookup_mDNS_server .. hlr: add TC_MSLookup_mDNS_server Send an mslookup mDNS request to OsmoHLR and verify the answer. Related: SYS#4618 Change-Id: Ia7f92d33691f910549353b16a7b0efc18e521719 --- M hlr/HLR_Tests.cfg M hlr/HLR_Tests.default M hlr/HLR_Tests.ttcn M hlr/gen_links.sh M hlr/regen_makefile.sh A library/MSLookup_mDNS_Emulation.ttcn A library/MSLookup_mDNS_Templates.ttcn A library/MSLookup_mDNS_Types.ttcn 8 files changed, 272 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/14/16914/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia7f92d33691f910549353b16a7b0efc18e521719 Gerrit-Change-Number: 16914 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: newpatchset
Change in osmo-ttcn3-hacks[master]: hlr: add TC_MSLookup_mDNS_server
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 ) Change subject: hlr: add TC_MSLookup_mDNS_server .. Patch Set 5: (2 comments) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914/4/library/MSLookup_mDNS_Emulation.ttcn File library/MSLookup_mDNS_Emulation.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914/4/library/MSLookup_mDNS_Emulation.ttcn@16 PS4, Line 16: function f_main() runs on MSLookup_mDNS_Emulation_CT > What's this doing exactly? I'd welcome some comment above explaining it a bit. Done https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914/4/library/MSLookup_mDNS_Emulation.ttcn@36 PS4, Line 36: repeat; > wrong indentation Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia7f92d33691f910549353b16a7b0efc18e521719 Gerrit-Change-Number: 16914 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 17 Jan 2020 12:52:04 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in docker-playground[master]: ttcn3-hlr-test: set mp_hlr_supports_dgsm
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16915 ) Change subject: ttcn3-hlr-test: set mp_hlr_supports_dgsm .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16915 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Iafdf267c6012264966857e41e855fa971f773023 Gerrit-Change-Number: 16915 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jan 2020 12:23:57 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: hlr: add TC_MSLookup_mDNS_server
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 ) Change subject: hlr: add TC_MSLookup_mDNS_server .. Patch Set 4: (2 comments) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914/4/library/MSLookup_mDNS_Emulation.ttcn File library/MSLookup_mDNS_Emulation.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914/4/library/MSLookup_mDNS_Emulation.ttcn@16 PS4, Line 16: function f_main() runs on MSLookup_mDNS_Emulation_CT What's this doing exactly? I'd welcome some comment above explaining it a bit. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914/4/library/MSLookup_mDNS_Emulation.ttcn@36 PS4, Line 36: repeat; wrong indentation -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia7f92d33691f910549353b16a7b0efc18e521719 Gerrit-Change-Number: 16914 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 17 Jan 2020 12:16:41 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: deps: use UDPasp from osmocom github fork
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16913 ) Change subject: deps: use UDPasp from osmocom github fork .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16913 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie7e1c3dbd67dba9079a5768e442faffc936fd7fa Gerrit-Change-Number: 16913 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jan 2020 12:11:10 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: hlr: f_perform_UL: add CnDomain parameter
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16911 ) Change subject: hlr: f_perform_UL: add CnDomain parameter .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16911 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Idd699f054c9242614b9bea066428293f8b2da9c2 Gerrit-Change-Number: 16911 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jan 2020 12:10:02 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: deps: add titan.ProtocolModules.DNS
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16912 ) Change subject: deps: add titan.ProtocolModules.DNS .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16912 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I89dd528b7934892c5a24209374e8218a95db6ab3 Gerrit-Change-Number: 16912 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jan 2020 12:10:14 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: ta_control: move timing advance code from osmo-bts-trx to common
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16885 ) Change subject: ta_control: move timing advance code from osmo-bts-trx to common .. Patch Set 4: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/16885/4/src/common/ta_control.c File src/common/ta_control.c: https://gerrit.osmocom.org/c/osmo-bts/+/16885/4/src/common/ta_control.c@30 PS4, Line 30: #define TOA256_MAX 63 AFAIU that's not TOA256, but TOA. TOA256_MAX would be 63*256, right? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16885 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If7ddf74db3abc9b9872abe620a0aeebe3327e70a Gerrit-Change-Number: 16885 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jan 2020 12:08:02 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmocom-bb[master]: logging: use meaningful default loglevels
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16892 ) Change subject: logging: use meaningful default loglevels .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3faefccae2218b17bd942bc2afac7d8e515897b7 Gerrit-Change-Number: 16892 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: dexter Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 17 Jan 2020 12:08:33 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: hlr: add TC_MSLookup_mDNS_server
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 to look at the new patch set (#4). Change subject: hlr: add TC_MSLookup_mDNS_server .. hlr: add TC_MSLookup_mDNS_server Send an mslookup mDNS request to OsmoHLR and verify the answer. Related: SYS#4618 Change-Id: Ia7f92d33691f910549353b16a7b0efc18e521719 --- M hlr/HLR_Tests.cfg M hlr/HLR_Tests.default M hlr/HLR_Tests.ttcn M hlr/gen_links.sh M hlr/regen_makefile.sh A library/MSLookup_mDNS_Emulation.ttcn A library/MSLookup_mDNS_Templates.ttcn A library/MSLookup_mDNS_Types.ttcn 8 files changed, 269 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/14/16914/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia7f92d33691f910549353b16a7b0efc18e521719 Gerrit-Change-Number: 16914 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in osmo-ttcn3-hacks[master]: hlr: add TC_MSLookup_mDNS_server
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 to look at the new patch set (#3). Change subject: hlr: add TC_MSLookup_mDNS_server .. hlr: add TC_MSLookup_mDNS_server Send an mslookup mDNS request to OsmoHLR and verify the answer. Related: SYS#4618 Change-Id: Ia7f92d33691f910549353b16a7b0efc18e521719 --- M hlr/HLR_Tests.cfg M hlr/HLR_Tests.default M hlr/HLR_Tests.ttcn M hlr/gen_links.sh M hlr/regen_makefile.sh A library/MSLookup_mDNS_Emulation.ttcn A library/MSLookup_mDNS_Templates.ttcn A library/MSLookup_mDNS_Types.ttcn 8 files changed, 271 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/14/16914/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia7f92d33691f910549353b16a7b0efc18e521719 Gerrit-Change-Number: 16914 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in osmo-ttcn3-hacks[master]: deps: use UDPasp from osmocom github fork
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16913 to look at the new patch set (#2). Change subject: deps: use UDPasp from osmocom github fork .. deps: use UDPasp from osmocom github fork Has additional SO_REUSEADDR patch, which is needed for D-GSM mslookup mDNS testing. Related: SYS#4618 Change-Id: Ie7e1c3dbd67dba9079a5768e442faffc936fd7fa --- M deps/Makefile 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/13/16913/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16913 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie7e1c3dbd67dba9079a5768e442faffc936fd7fa Gerrit-Change-Number: 16913 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in osmo-ttcn3-hacks[master]: deps: add titan.ProtocolModules.DNS
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16912 to look at the new patch set (#2). Change subject: deps: add titan.ProtocolModules.DNS .. deps: add titan.ProtocolModules.DNS To be used in mslookup mDNS tests. Related: SYS#4618 Change-Id: I89dd528b7934892c5a24209374e8218a95db6ab3 --- M deps/Makefile 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/12/16912/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16912 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I89dd528b7934892c5a24209374e8218a95db6ab3 Gerrit-Change-Number: 16912 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in osmo-ttcn3-hacks[master]: hlr: add TC_MSLookup_mDNS_server
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 to look at the new patch set (#2). Change subject: hlr: add TC_MSLookup_mDNS_server .. hlr: add TC_MSLookup_mDNS_server Send an mslookup mDNS request to OsmoHLR and verify the answer. Related: SYS#4618 Change-Id: Ia7f92d33691f910549353b16a7b0efc18e521719 --- M hlr/HLR_Tests.cfg M hlr/HLR_Tests.default M hlr/HLR_Tests.ttcn M hlr/gen_links.sh M hlr/regen_makefile.sh A library/MSLookup_mDNS_Emulation.ttcn A library/MSLookup_mDNS_Templates.ttcn A library/MSLookup_mDNS_Types.ttcn 8 files changed, 272 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/14/16914/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia7f92d33691f910549353b16a7b0efc18e521719 Gerrit-Change-Number: 16914 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in docker-playground[master]: ttcn3-hlr-test: set mp_hlr_supports_dgsm
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/16915 ) Change subject: ttcn3-hlr-test: set mp_hlr_supports_dgsm .. ttcn3-hlr-test: set mp_hlr_supports_dgsm Related: SYS#4618 Depends: osmo-ttcn3-hacks Ia7f92d33691f910549353b16a7b0efc18e521719 Change-Id: Iafdf267c6012264966857e41e855fa971f773023 --- M ttcn3-hlr-test/HLR_Tests.cfg M ttcn3-hlr-test/jenkins.sh 2 files changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/15/16915/1 diff --git a/ttcn3-hlr-test/HLR_Tests.cfg b/ttcn3-hlr-test/HLR_Tests.cfg index b8aa886..9258cea 100644 --- a/ttcn3-hlr-test/HLR_Tests.cfg +++ b/ttcn3-hlr-test/HLR_Tests.cfg @@ -9,6 +9,7 @@ [MODULE_PARAMETERS] HLR_Tests.mp_hlr_ip := "172.18.10.20" +HLR_Tests.mp_hlr_supports_dgsm := true [MAIN_CONTROLLER] diff --git a/ttcn3-hlr-test/jenkins.sh b/ttcn3-hlr-test/jenkins.sh index 2bf1f98..74aa37f 100755 --- a/ttcn3-hlr-test/jenkins.sh +++ b/ttcn3-hlr-test/jenkins.sh @@ -13,6 +13,12 @@ mkdir $VOL_BASE_DIR/hlr-tester cp HLR_Tests.cfg $VOL_BASE_DIR/hlr-tester/ +# Disable D-GSM tests until osmo-hlr.git release > 1.2.0 is available +if [ "$IMAGE_SUFFIX" = "latest" ]; then + sed "s/HLR_Tests.mp_hlr_supports_dgsm := true/HLR_Tests.mp_hlr_supports_dgsm := false/g" -i \ + "$VOL_BASE_DIR/hlr-tester/HLR_Tests.cfg" +fi + mkdir $VOL_BASE_DIR/hlr cp osmo-hlr.cfg $VOL_BASE_DIR/hlr/ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16915 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Iafdf267c6012264966857e41e855fa971f773023 Gerrit-Change-Number: 16915 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: deps: add titan.ProtocolModules.DNS
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16912 ) Change subject: deps: add titan.ProtocolModules.DNS .. deps: add titan.ProtocolModules.DNS To be used in mslookup mDNS tests. Related: SYS#4618 Change-Id: I89dd528b7934892c5a24209374e8218a95db6ab3 --- M deps/Makefile 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/12/16912/1 diff --git a/deps/Makefile b/deps/Makefile index 5d263aa..4566eae 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -19,6 +19,7 @@ OSMOGIT:=git://git.osmocom.org ECLIPSEGIT_REPOS= titan.Libraries.TCCUsefulFunctions \ + titan.ProtocolModules.DNS \ titan.ProtocolModules.ICMP \ titan.ProtocolModules.ICMPv6 \ titan.ProtocolModules.IP \ @@ -81,6 +82,7 @@ titan.ProtocolModules.BSSAPP_v7.3.0_commit=R.2.A titan.ProtocolModules.BSSGP_v13.0.0_commit=R.2.A titan.ProtocolModules.BSSMAP_commit= master +titan.ProtocolModules.DNS_commit= R.7.B titan.ProtocolModules.GRE_commit= R.2.A titan.ProtocolModules.GTP_v13.5.0_commit= R.2.A titan.ProtocolModules.GTPv2_v13.7.0_commit=R.2.A -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16912 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I89dd528b7934892c5a24209374e8218a95db6ab3 Gerrit-Change-Number: 16912 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: hlr: add TC_MSLookup_mDNS_server
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 )
Change subject: hlr: add TC_MSLookup_mDNS_server
..
hlr: add TC_MSLookup_mDNS_server
Send an mslookup mDNS request to OsmoHLR and verify the answer.
Related: SYS#4618
Change-Id: Ia7f92d33691f910549353b16a7b0efc18e521719
---
M hlr/HLR_Tests.cfg
M hlr/HLR_Tests.default
M hlr/HLR_Tests.ttcn
M hlr/gen_links.sh
M hlr/regen_makefile.sh
A library/MSLookup_mDNS_Emulation.ttcn
A library/MSLookup_mDNS_Templates.ttcn
A library/MSLookup_mDNS_Types.ttcn
8 files changed, 271 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/14/16914/1
diff --git a/hlr/HLR_Tests.cfg b/hlr/HLR_Tests.cfg
index 7416362..1ab6e87 100644
--- a/hlr/HLR_Tests.cfg
+++ b/hlr/HLR_Tests.cfg
@@ -12,6 +12,7 @@
[MODULE_PARAMETERS]
+HLR_Tests.mp_hlr_supports_dgsm := true
[MAIN_CONTROLLER]
diff --git a/hlr/HLR_Tests.default b/hlr/HLR_Tests.default
index 84d4ff3..2e9aac6 100644
--- a/hlr/HLR_Tests.default
+++ b/hlr/HLR_Tests.default
@@ -11,6 +11,11 @@
*.VTY.CTRL_CLIENT_CLEANUP_LINEFEED := "yes"
*.VTY.CTRL_DETECT_CONNECTION_ESTABLISHMENT_RESULT := "yes"
*.VTY.PROMPT1 := "OsmoHLR> "
+*.mDNS_UDP.debugging := "YES"
+*.mDNS_UDP.localPort := "4266"
+*.mDNS_UDP.localIPAddr := "239.192.23.42"
+*.mDNS_UDP.broadcast := "enabled"
+*.mDNS_UDP.reuseAddr := "enabled"
[MODULE_PARAMETERS]
Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoHLR";
diff --git a/hlr/HLR_Tests.ttcn b/hlr/HLR_Tests.ttcn
index 0c56bcd..3e9f69a 100644
--- a/hlr/HLR_Tests.ttcn
+++ b/hlr/HLR_Tests.ttcn
@@ -31,6 +31,11 @@
import from Osmocom_VTY_Functions all;
import from TELNETasp_PortType all;
+import from DNS_Types all;
+import from MSLookup_mDNS_Types all;
+import from MSLookup_mDNS_Emulation all;
+import from MSLookup_mDNS_Templates all;
+
type component test_CT extends CTRL_Adapter_CT {
var IPA_Emulation_CT vc_IPA;
var IPA_CCM_Parameters ccm_pars;
@@ -43,6 +48,8 @@
port TELNETasp_PT VTY;
+ var MSLookup_mDNS_Emulation_CT vc_MSLookup_mDNS;
+
timer g_Tguard := 10.0;
};
@@ -50,6 +57,9 @@
charstring mp_hlr_ip := "127.0.0.1";
integer mp_hlr_gsup_port := 4222;
integer mp_hlr_ctrl_port := 4259;
+
+ /* Drop after osmo-hlr release > 1.2.0 */
+ boolean mp_hlr_supports_dgsm := true;
};
type record HlrSubscrAud2G {
@@ -77,6 +87,7 @@
timer g_Tguard := 10.0;
var HLR_ConnHdlrPars g_pars;
port TELNETasp_PT VTY;
+ port MSLookup_mDNS_PT mDNS;
}
type record HLR_ConnHdlrPars {
@@ -113,6 +124,9 @@
map(self:VTY, system:VTY);
f_vty_set_prompts(VTY);
f_vty_transceive(VTY, "enable");
+ if (mp_hlr_supports_dgsm) {
+ f_vty_config(VTY, "mslookup", "no mdns bind");
+ }
}
private altstep as_Tguard() runs on test_CT {
@@ -164,6 +178,11 @@
}
}
+function f_init_mslookup() runs on test_CT {
+ vc_MSLookup_mDNS := MSLookup_mDNS_Emulation_CT.create;
+ vc_MSLookup_mDNS.start(MSLookup_mDNS_Emulation.f_main());
+}
+
function f_init(boolean legacy := true) runs on test_CT {
/* activate default guard timer to ensure all tests eventually
terminate */
@@ -172,6 +191,7 @@
f_init_gsup("HLR_Test", legacy);
f_init_vty();
+ f_init_mslookup();
f_ipa_ctrl_start(mp_hlr_ip, mp_hlr_ctrl_port);
}
@@ -183,6 +203,7 @@
vc_conn := HLR_ConnHdlr.create(id);
connect(vc_conn:GSUP, vc_GSUP:GSUP_CLIENT);
connect(vc_conn:GSUP_PROC, vc_GSUP:GSUP_PROC);
+ connect(vc_conn:mDNS, vc_MSLookup_mDNS:mDNS);
vc_conn.start(f_handler_init(fn, id, pars));
return vc_conn;
@@ -1455,6 +1476,63 @@
vc_conn.done;
}
+/* Send an mslookup mDNS request to OsmoHLR and verify the answer */
+private function f_TC_MSLookup_mDNS_server() runs on HLR_ConnHdlr {
+ timer T;
+ var MSLookup_mDNS vl_rmsg;
+ var integer id := f_rnd_int(65535); /* mDNS packet ID */
+ var hexstring msisdn := '49161'H & f_rnd_hexstring(7, 9);
+ var charstring domain := "sip.voice." & hex2str(msisdn) &
".msisdn.mdns.osmocom.org";
+
+ /* Create subscriber */
+ g_pars.sub.msisdn := msisdn;
+ f_vty_subscr_create(VTY, g_pars.sub);
+
+ /* Send mDNS query, expect timeout */
+ mDNS.send(t_MSLookup_mDNS_query(id, domain));
+ T.start(1.0);
+ alt {
+ [] mDNS.receive(tr_MSLookup_mDNS_result_IPv4(id, domain, '42424242'O,
5060)) {
+ setverdict(fail, "OsmoHLR answered to mDNS query before
subscriber did LU");
+ }
+ [] mDNS.receive(MSLookup_mDNS:?) -> value vl_rmsg {
+ repeat;
+ }
+ [] T.timeout {
+ }
+ }
+
+ /* Location update */
+ f_perform_UL(g_pars.sub.imsi, msisdn, dom := OSMO_GSUP_CN_DOMAIN_CS);
+
+ /* Send mDNS
Change in osmo-ttcn3-hacks[master]: hlr: f_perform_UL: add CnDomain parameter
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16911 )
Change subject: hlr: f_perform_UL: add CnDomain parameter
..
hlr: f_perform_UL: add CnDomain parameter
Make it possible to do CS location update, not only PS. This is needed
for upcoming D-GSM related tests.
Related: SYS#4618
Change-Id: Idd699f054c9242614b9bea066428293f8b2da9c2
---
M hlr/HLR_Tests.ttcn
M library/GSUP_Types.ttcn
2 files changed, 5 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/11/16911/1
diff --git a/hlr/HLR_Tests.ttcn b/hlr/HLR_Tests.ttcn
index 50109a6..0c56bcd 100644
--- a/hlr/HLR_Tests.ttcn
+++ b/hlr/HLR_Tests.ttcn
@@ -436,7 +436,8 @@
}
function f_perform_UL(hexstring imsi, template hexstring msisdn,
- template (omit) integer exp_err_cause := omit)
+ template (omit) integer exp_err_cause := omit,
+ GSUP_CnDomain dom := OSMO_GSUP_CN_DOMAIN_PS)
runs on HLR_ConnHdlr return GSUP_PDU {
var GSUP_PDU ret;
timer T := 3.0;
@@ -446,7 +447,7 @@
exp_fail := true;
}
- GSUP.send(valueof(ts_GSUP_UL_REQ(imsi)));
+ GSUP.send(valueof(ts_GSUP_UL_REQ(imsi, dom)));
T.start;
alt {
[exp_fail] GSUP.receive(tr_GSUP_UL_ERR(imsi, exp_err_cause)) -> value
ret {
diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn
index d4b1db1..d32b2f1 100644
--- a/library/GSUP_Types.ttcn
+++ b/library/GSUP_Types.ttcn
@@ -486,9 +486,9 @@
tr_GSUP(OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT, {
tr_GSUP_IE_IMSI(imsi), *,
tr_GSUP_IE(OSMO_GSUP_AUTH_TUPLE_IE), * });
-template (value) GSUP_PDU ts_GSUP_UL_REQ(hexstring imsi) :=
+template (value) GSUP_PDU ts_GSUP_UL_REQ(hexstring imsi, GSUP_CnDomain dom :=
OSMO_GSUP_CN_DOMAIN_PS) :=
ts_GSUP(OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST, {
- valueof(ts_GSUP_IE_IMSI(imsi)) });
+ valueof(ts_GSUP_IE_IMSI(imsi)),
valueof(ts_GSUP_IE_CnDomain(dom)) });
template GSUP_PDU tr_GSUP_UL_REQ(template hexstring imsi) :=
tr_GSUP_IMSI(OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST, imsi);
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16911
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Idd699f054c9242614b9bea066428293f8b2da9c2
Gerrit-Change-Number: 16911
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: deps: use UDPasp from osmocom github fork
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16913 ) Change subject: deps: use UDPasp from osmocom github fork .. deps: use UDPasp from osmocom github fork Has additional SO_REUSEADDR patch, which is needed for D-GSM mslookup mDNS testing. Related: SYS#4618 Change-Id: Ie7e1c3dbd67dba9079a5768e442faffc936fd7fa --- M deps/Makefile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/13/16913/1 diff --git a/deps/Makefile b/deps/Makefile index 4566eae..35a5ee4 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -39,7 +39,6 @@ titan.TestPorts.SIPmsg \ titan.TestPorts.TCPasp \ titan.TestPorts.TELNETasp \ - titan.TestPorts.UDPasp \ titan.TestPorts.UNIX_DOMAIN_SOCKETasp ECLIPSEGIT2_REPOS= titan.ProtocolModules.GRE \ @@ -64,6 +63,7 @@ titan.ProtocolModules.LLC_v7.1.0 \ titan.ProtocolModules.SGsAP_13.2.0 \ titan.TestPorts.MTP3asp \ + titan.TestPorts.UDPasp \ titan.ProtocolModules.M3UA \ titan.ProtocolEmulations.M3UA -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16913 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie7e1c3dbd67dba9079a5768e442faffc936fd7fa Gerrit-Change-Number: 16913 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
Change in osmo-bsc[master]: bsc_main: use higher default loglevels.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16886 ) Change subject: bsc_main: use higher default loglevels. .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/16886/1/src/osmo-bsc/osmo_bsc_main.c File src/osmo-bsc/osmo_bsc_main.c: https://gerrit.osmocom.org/c/osmo-bsc/+/16886/1/src/osmo-bsc/osmo_bsc_main.c@a716 PS1, Line 716: LOGL_INFO What's wrong with having INFO by default? What is the point of this API (*.loglevel = LOGL_FOO) then if we set NOTICE evertwhere? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16886 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I03a5426b341e9908ffc89240f97d6d3ea791b4a8 Gerrit-Change-Number: 16886 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Fri, 17 Jan 2020 10:36:02 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in libosmocore[master]: application.c: check default loglevels on startup
dexter has abandoned this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16833 ) Change subject: application.c: check default loglevels on startup .. Abandoned After all I think this patch was not the best Idea. Looking through the projects and correcting the loglevels if needed is better I think. Also I see that the print to stderr messes up some unit-tests. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16833 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2d7e345c14a188430a0e991bfd9fb0343d05ea92 Gerrit-Change-Number: 16833 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: abandon
Change in osmocom-bb[master]: logging: use meaningful default loglevels
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16892 ) Change subject: logging: use meaningful default loglevels .. Patch Set 1: This was the wrong patch, sorry. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3faefccae2218b17bd942bc2afac7d8e515897b7 Gerrit-Change-Number: 16892 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: dexter Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 17 Jan 2020 10:10:06 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmocom-bb[master]: logging: use meaningful default loglevels
dexter has restored this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16892 ) Change subject: logging: use meaningful default loglevels .. Restored -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3faefccae2218b17bd942bc2afac7d8e515897b7 Gerrit-Change-Number: 16892 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-CC: Jenkins Builder Gerrit-MessageType: restore
Change in osmo-bts[master]: ta_control: move timing advance code from osmo-bts-trx to common
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16885 ) Change subject: ta_control: move timing advance code from osmo-bts-trx to common .. Patch Set 4: (5 comments) https://gerrit.osmocom.org/c/osmo-bts/+/16885/3/src/common/ta_control.c File src/common/ta_control.c: https://gerrit.osmocom.org/c/osmo-bts/+/16885/3/src/common/ta_control.c@52 PS3, Line 52: LOGL_INFO > maybe switch this to DEBUG, as a non-changing TA is the default, and one > might want to see only the […] Done https://gerrit.osmocom.org/c/osmo-bts/+/16885/2/src/osmo-bts-trx/trx_vty.c File src/osmo-bts-trx/trx_vty.c: https://gerrit.osmocom.org/c/osmo-bts/+/16885/2/src/osmo-bts-trx/trx_vty.c@196 PS2, Line 196: vty_out (vty, "'no osmotrx timing-advance-loop' is deprecated%s", VTY_NEWLINE); > I'd add some string telling the user that no extra operation is needed, TA > loop will be enabled by d […] Its now active by default. I can make it optional if there are any concerns but in the end its a standard feature of a BTS. https://gerrit.osmocom.org/c/osmo-bts/+/16885/2/tests/ta_control/ta_control_test.c File tests/ta_control/ta_control_test.c: https://gerrit.osmocom.org/c/osmo-bts/+/16885/2/tests/ta_control/ta_control_test.c@43 PS2, Line 43: for (i=0; i spacing i = 0; i < steps looks like I forgot to run lindent.sh https://gerrit.osmocom.org/c/osmo-bts/+/16885/2/tests/ta_control/ta_control_test.c@47 PS2, Line 47: > whitespace Done https://gerrit.osmocom.org/c/osmo-bts/+/16885/2/tests/ta_control/ta_control_test.c@55 PS2, Line 55: > whitespace Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16885 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If7ddf74db3abc9b9872abe620a0aeebe3327e70a Gerrit-Change-Number: 16885 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jan 2020 10:01:58 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: laforge Gerrit-MessageType: comment
