Change in pysim[master]: Fix file permission
herlesupreeth has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16942 ) Change subject: Fix file permission .. Patch Set 4: > Patch Set 4: > > > Patch Set 4: > > > > > Patch Set 4: Code-Review+2 > > > > A quick question regarding the merging of patches, am I supposed to merge > > these changes or the reviewers will merge them? If it is the former, could > > someone please let me know how to do it? > > > > Many thanks!! > > We usually follow these rules: > https://osmocom.org/projects/cellular-infrastructure/wiki/Gerrit/#Voting-Rules-for-merging-a-patch-to-master. > As soon as your change and *its predecessors* get at least CR+1+2, you can > merge it yourself (Submit button is what you're looking for). If you don't > have time, I could take care about this patch set on holidays. Thanks a lot for that information. However, on the top i see "Submit" greyed out and upon hovering it says i dont have permission to Submit. It would be great if you could take of this patch and if possible others which have received +2 votes. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I893869329e9547e06386baf4d16a18e545042d62 Gerrit-Change-Number: 16942 Gerrit-PatchSet: 4 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 31 Jan 2020 07:32:36 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-sgsn[master]: mm_state_gb_fsm: Handle implicit detach from mm_standby
lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/17080 ) Change subject: mm_state_gb_fsm: Handle implicit detach from mm_standby .. Patch Set 1: Can you add a more detailed description why it should be handled. E.g. For MS in standby the Routing Area is still known, but not the exact cell. On an Implicit Detach, drop all context similiar to a implicit detach for a MS in ready state. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/17080 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I63d04a2dcdc17b4df6616c515641c435d919c787 Gerrit-Change-Number: 17080 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: lynxis lazus Gerrit-Comment-Date: Fri, 31 Jan 2020 05:56:31 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Build failure of network:osmocom:nightly/osmo-python-tests in Debian_Testing/x86_64
Visit
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-python-tests/Debian_Testing/x86_64
Package network:osmocom:nightly/osmo-python-tests failed to build in
Debian_Testing/x86_64
Check out the package for editing:
osc checkout network:osmocom:nightly osmo-python-tests
Last lines of build log:
[ 139s] dpkg-source --before-build .
[ 139s] dpkg-buildpackage: info: host architecture amd64
[ 140s] fakeroot debian/rules clean
[ 140s] dh clean --with python3 --buildsystem=pybuild
[ 140s]dh_auto_clean -O--buildsystem=pybuild
[ 140s] I: pybuild base:217: python3.7 setup.py clean
[ 141s] Traceback (most recent call last):
[ 141s] File "setup.py", line 18, in
[ 141s] from setuptools import setup, find_packages
[ 141s] File "/usr/lib/python3/dist-packages/setuptools/__init__.py", line
20, in
[ 141s] from setuptools.dist import Distribution, Feature
[ 141s] File "/usr/lib/python3/dist-packages/setuptools/dist.py", line 36,
in
[ 141s] from setuptools import windows_support
[ 141s] File "/usr/lib/python3/dist-packages/setuptools/windows_support.py",
line 2, in
[ 141s] import ctypes
[ 141s] File "/usr/lib/python3.7/ctypes/__init__.py", line 7, in
[ 141s] from _ctypes import Union, Structure, Array
[ 141s] ImportError: libffi.so.7: cannot open shared object file: No such file
or directory
[ 141s] E: pybuild pybuild:341: clean: plugin distutils failed with: exit
code=1: python3.7 setup.py clean
[ 141s] dh_auto_clean: error: pybuild --clean -i python{version} -p 3.7
returned exit code 13
[ 141s] make: *** [debian/rules:4: clean] Error 25
[ 141s] dpkg-buildpackage: error: fakeroot debian/rules clean subprocess
returned exit status 2
[ 141s]
[ 141s] lamb54 failed "build osmo-python-tests_0.0.9.20200131.dsc" at Fri Jan
31 04:16:12 UTC 2020.
[ 141s]
[ 141s] ### VM INTERACTION START ###
[ 144s] [ 132.774315] sysrq: SysRq : Power Off
[ 144s] [ 132.782487] reboot: Power down
[ 144s] ### VM INTERACTION END ###
--
Configure notifications at https://build.opensuse.org/my/notifications
openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/libosmo-dsp in Debian_Testing/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-dsp/Debian_Testing/x86_64 Package network:osmocom:nightly/libosmo-dsp failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-dsp Last lines of build log: [ 661s] /bin/bash ../libtool --tag=CC --mode=link gcc -Wall -ffast-math -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -version-info 0:1:0 -lfftw3f -Wl,-z,relro -Wl,-z,now -o libosmodsp.la -rpath /usr/lib/x86_64-linux-gnu cfile.lo cxvec.lo cxvec_math.lo iqbal.lo [ 661s] libtool: link: gcc -shared -fPIC -DPIC .libs/cfile.o .libs/cxvec.o .libs/cxvec_math.o .libs/iqbal.o -lfftw3f -g -O2 -fstack-protector-strong -Wl,-z -Wl,relro -Wl,-z -Wl,now -Wl,-soname -Wl,libosmodsp.so.0 -o .libs/libosmodsp.so.0.0.1 [ 661s] libtool: link: (cd ".libs" && rm -f "libosmodsp.so.0" && ln -s "libosmodsp.so.0.0.1" "libosmodsp.so.0") [ 661s] libtool: link: (cd ".libs" && rm -f "libosmodsp.so" && ln -s "libosmodsp.so.0.0.1" "libosmodsp.so") [ 661s] libtool: link: ar cru .libs/libosmodsp.a cfile.o cxvec.o cxvec_math.o iqbal.o [ 661s] ar: `u' modifier ignored since `D' is the default (see `U') [ 661s] libtool: link: ranlib .libs/libosmodsp.a [ 661s] libtool: link: ( cd ".libs" && rm -f "libosmodsp.la" && ln -s "../libosmodsp.la" "libosmodsp.la" ) [ 661s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 661s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 661s] mkdir -p doc [ 661s] /usr/bin/doxygen Doxyfile [ 661s] /usr/bin/doxygen: error while loading shared libraries: libffi.so.7: cannot open shared object file: No such file or directory [ 661s] make[3]: *** [Makefile:931: doc/html/index.html] Error 127 [ 661s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 661s] make[2]: *** [Makefile:488: all-recursive] Error 1 [ 661s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 661s] make[1]: *** [Makefile:374: all] Error 2 [ 661s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 661s] dh_auto_build: error: make -j1 returned exit code 2 [ 661s] make: *** [debian/rules:13: build] Error 25 [ 661s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 661s] [ 661s] lamb07 failed "build libosmodsp_0.4.0.dsc" at Fri Jan 31 04:07:31 UTC 2020. [ 661s] [ 661s] ### VM INTERACTION START ### [ 664s] [ 609.809615] sysrq: SysRq : Power Off [ 664s] [ 609.825497] reboot: Power down [ 664s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/)
Change in osmo-sgsn[master]: gprs_gmm: Check for RAT change and ensure this only happens for RAU/ATT
daniel has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-sgsn/+/17081 )
Change subject: gprs_gmm: Check for RAT change and ensure this only happens for
RAU/ATT
..
gprs_gmm: Check for RAT change and ensure this only happens for RAU/ATT
Change-Id: I38cb31907eddeade5350cdb648df179408d908d2
Related: OS#3727
---
M src/sgsn/gprs_gmm.c
1 file changed, 27 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/81/17081/1
diff --git a/src/sgsn/gprs_gmm.c b/src/sgsn/gprs_gmm.c
index f62d0d1..c574dac 100644
--- a/src/sgsn/gprs_gmm.c
+++ b/src/sgsn/gprs_gmm.c
@@ -1099,6 +1099,16 @@
osmo_fsm_inst_dispatch(ctx->gmm_fsm, E_GMM_COMMON_PROC_INIT_REQ, NULL);
}
+/* Detect if RAT has changed */
+static bool mmctx_did_rat_change(struct sgsn_mm_ctx *mmctx, struct msgb *msg)
+{
+ if (MSG_IU_UE_CTX(msg) && mmctx->ran_type != MM_CTX_T_UTRAN_Iu)
+ return true;
+ if (!MSG_IU_UE_CTX(msg) && mmctx->ran_type != MM_CTX_T_GERAN_Gb)
+ return true;
+ return false;
+}
+
/* 3GPP TS 24.008 § 9.4.1 Attach request */
static int gsm48_rx_gmm_att_req(struct sgsn_mm_ctx *ctx, struct msgb *msg,
struct gprs_llc_llme *llme)
@@ -1944,6 +1954,23 @@
return rc;
}
+ /* A RAT change is only expected/allowed for RAU/Attach Req */
+ if (mmctx && mmctx_did_rat_change(mmctx, msg)) {
+ switch (gh->msg_type) {
+ case GSM48_MT_GMM_RA_UPD_REQ:
+ case GSM48_MT_GMM_ATTACH_REQ:
+ break;
+ default:
+ /* This shouldn't happen with other message types and
+* we need to error out to prevent a crash */
+ LOGMMCTXP(LOGL_NOTICE, mmctx, "Dropping GMM %s which
was received on different "
+ "RAT (mmctx ran_type=%u,
msg_iu_ue_ctx=%p\n",
+ get_value_string(gprs_msgt_gmm_names,
gh->msg_type),
+ mmctx->ran_type, MSG_IU_UE_CTX(msg));
+ return -EINVAL;
+ }
+ }
+
/*
* For a few messages, mmctx may be NULL. For most, we want to ensure a
* non-NULL mmctx. At the same time, we want to keep the message
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/17081
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I38cb31907eddeade5350cdb648df179408d908d2
Gerrit-Change-Number: 17081
Gerrit-PatchSet: 1
Gerrit-Owner: daniel
Gerrit-MessageType: newchange
Change in osmo-sgsn[master]: mm_state_gb_fsm: Handle implicit detach from mm_standby
daniel has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-sgsn/+/17080 )
Change subject: mm_state_gb_fsm: Handle implicit detach from mm_standby
..
mm_state_gb_fsm: Handle implicit detach from mm_standby
Change-Id: I63d04a2dcdc17b4df6616c515641c435d919c787
Related: OS#2737
---
M src/sgsn/gprs_mm_state_gb_fsm.c
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/80/17080/1
diff --git a/src/sgsn/gprs_mm_state_gb_fsm.c b/src/sgsn/gprs_mm_state_gb_fsm.c
index 811f0c2..d3f2ea3 100644
--- a/src/sgsn/gprs_mm_state_gb_fsm.c
+++ b/src/sgsn/gprs_mm_state_gb_fsm.c
@@ -68,6 +68,9 @@
case E_MM_PDU_RECEPTION:
mm_state_gb_fsm_state_chg(fi, ST_MM_READY);
break;
+ case E_MM_IMPLICIT_DETACH:
+ mm_state_gb_fsm_state_chg(fi, ST_MM_IDLE);
+ break;
}
}
@@ -86,7 +89,7 @@
.action = st_mm_ready,
},
[ST_MM_STANDBY] = {
- .in_event_mask = X(E_MM_PDU_RECEPTION),
+ .in_event_mask = X(E_MM_PDU_RECEPTION) |
X(E_MM_IMPLICIT_DETACH),
.out_state_mask = X(ST_MM_IDLE) | X(ST_MM_READY),
.name = "Standby",
.action = st_mm_standby,
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/17080
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I63d04a2dcdc17b4df6616c515641c435d919c787
Gerrit-Change-Number: 17080
Gerrit-PatchSet: 1
Gerrit-Owner: daniel
Gerrit-MessageType: newchange
Change in osmo-sgsn[master]: gprs_gmm_fsm.c: Implement RAT change between 2g and 3g
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15487 ) Change subject: gprs_gmm_fsm.c: Implement RAT change between 2g and 3g .. Patch Set 12: (6 comments) https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/11/src/sgsn/gprs_gmm.c File src/sgsn/gprs_gmm.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/11/src/sgsn/gprs_gmm.c@1232 PS11, Line 1232:if (MSG_IU_UE_CTX(msg) && ctx->ran_type != MM_CTX_T_UTRAN_Iu) > Would be nice adding a comment here like: /* Detect MS switched to new a > Radio Access technology */ Done https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/11/src/sgsn/gprs_gmm.c@1644 PS11, Line 1644:if (MSG_IU_UE_CTX(msg) && mmctx->ran_type != MM_CTX_T_UTRAN_Iu) > The problem overall is, we have to refactor the full Attach Request/RAU > logic. […] Thanks for the clarification. Refactoring the logic belongs in a different patch(set), let's keep this for handling RAT changes and fixing the SGSN crash. https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/11/src/sgsn/gprs_gmm.c@1649 PS11, Line 1649:osmo_fsm_inst_dispatch(mmctx->gmm_fsm, E_GMM_COMMON_PROC_INIT_REQ, NULL); > So we need to find out before merging this patch blindly. Seems Lynxis moved the call here from line 1607 so we don't accidentally send messages (and crash) before handling the RAT change. I re-added the call to the code above with a check whether the RAT has changed. https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/11/src/sgsn/gprs_gmm.c@1663 PS11, Line 1663:if (!mmctx->gb.llme) > Agree, you probably want to pass new_rat_type, llme and msg. Actually the IMPLICIT_DETACH event causes the gb fsm to to to idle which in turn unassigns the llme and sets it to NULL. However, implicit detach is only handled from the mm_ready state and not from mm_standby. I think we should implement add that to the the gb fsm so we don't need to do this here or in the gmm_fsm. https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/9/src/sgsn/gprs_gmm_fsm.c File src/sgsn/gprs_gmm_fsm.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/9/src/sgsn/gprs_gmm_fsm.c@173 PS9, Line 173: (enum sgsn_ran_type) data; > I am pretty sure Coverity is not gonna like this this hack... When we pass a struct * as user data this will be resolved. https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/11/src/sgsn/gprs_gmm_fsm.c File src/sgsn/gprs_gmm_fsm.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/11/src/sgsn/gprs_gmm_fsm.c@165 PS11, Line 165: gmm_fsm_state_chg(fi, ST_GMM_DEREGISTERED); > I'm wondering whether the mmctx ran type needs to be set here too, or some > stuff needs to be dealloc […] It looks to me like we should just have a fall-through to the default: case in addition to setting the state to deregistered. There is nothing allocated in this fsm anyway it looks like, so I don't think there's anything to free? -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15487 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3fc614da6ba137e871ee0fe86ca22b6a4a354dd2 Gerrit-Change-Number: 15487 Gerrit-PatchSet: 12 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 30 Jan 2020 17:00:25 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: lynxis lazus Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Comment-In-Reply-To: daniel Gerrit-MessageType: comment
Change in osmo-sgsn[master]: gprs_gmm_fsm.c: Implement RAT change between 2g and 3g
daniel has uploaded a new patch set (#12) to the change originally created by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15487 ) Change subject: gprs_gmm_fsm.c: Implement RAT change between 2g and 3g .. gprs_gmm_fsm.c: Implement RAT change between 2g and 3g Related: OS#2737 Change-Id: I3fc614da6ba137e871ee0fe86ca22b6a4a354dd2 --- M include/osmocom/sgsn/gprs_gmm_fsm.h M src/sgsn/gprs_gmm.c M src/sgsn/gprs_gmm_fsm.c 3 files changed, 65 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/87/15487/12 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15487 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3fc614da6ba137e871ee0fe86ca22b6a4a354dd2 Gerrit-Change-Number: 15487 Gerrit-PatchSet: 12 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset
Change in simtrace2[master]: Merge branch 'master' of ssh://og/simtrace2
Hoernchen has abandoned this change. ( https://gerrit.osmocom.org/c/simtrace2/+/17076 ) Change subject: Merge branch 'master' of ssh://og/simtrace2 .. Abandoned -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/17076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ie72fe5300d36290ce5fbdefbc963dac3f7b9f73c Gerrit-Change-Number: 17076 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-CC: Jenkins Builder Gerrit-MessageType: abandon
Change in simtrace2[master]: cardem: disable upload for simtrace2
Hoernchen has abandoned this change. ( https://gerrit.osmocom.org/c/simtrace2/+/17077 ) Change subject: cardem: disable upload for simtrace2 .. Abandoned -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/17077 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I0bf0c28dcca6a7478f6c8f413f015f4cbe6d9a54 Gerrit-Change-Number: 17077 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-CC: Jenkins Builder Gerrit-MessageType: abandon
Change in simtrace2[master]: cardem: disable upload for simtrace2
Hoernchen has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/simtrace2/+/17077 ) Change subject: cardem: disable upload for simtrace2 .. cardem: disable upload for simtrace2 cardem on the st2 has been broken forever and still does not work, so stop uploading cardem binaries Change-Id: I0bf0c28dcca6a7478f6c8f413f015f4cbe6d9a54 --- M contrib/jenkins.sh 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/77/17077/2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/17077 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I0bf0c28dcca6a7478f6c8f413f015f4cbe6d9a54 Gerrit-Change-Number: 17077 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset
Change in simtrace2[master]: Merge branch 'master' of ssh://og/simtrace2
Hoernchen has abandoned this change. ( https://gerrit.osmocom.org/c/simtrace2/+/17078 ) Change subject: Merge branch 'master' of ssh://og/simtrace2 .. Abandoned -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/17078 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I934e488d631b083051cb349853a8217e1dc94299 Gerrit-Change-Number: 17078 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-CC: Jenkins Builder Gerrit-MessageType: abandon
Change in simtrace2[master]: cardem: disable upload for simtrace2
Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/17079 ) Change subject: cardem: disable upload for simtrace2 .. cardem: disable upload for simtrace2 cardem on the st2 has been broken forever and still does not work, so stop uploading cardem binaries Change-Id: I33828f799d41386afb3f8dcd9bb510902877e03f --- M contrib/jenkins.sh 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/79/17079/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 3ed1345..7ddfa6e 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -63,6 +63,8 @@ # make -C "$base/doc/manuals" publish #fi +rm -rf $TOPDIR/firmware/bin/simtrace-cardem* + if [ "x$publish" = "x--publish" ]; then echo echo "=== UPLOAD BUILD ==" -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/17079 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I33828f799d41386afb3f8dcd9bb510902877e03f Gerrit-Change-Number: 17079 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange
Change in simtrace2[master]: Merge branch 'master' of ssh://og/simtrace2
Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/17078 ) Change subject: Merge branch 'master' of ssh://og/simtrace2 .. Merge branch 'master' of ssh://og/simtrace2 Change-Id: I934e488d631b083051cb349853a8217e1dc94299 --- 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/78/17078/1 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/17078 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I934e488d631b083051cb349853a8217e1dc94299 Gerrit-Change-Number: 17078 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange
Change in simtrace2[master]: Merge branch 'master' of ssh://og/simtrace2
Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/17076 ) Change subject: Merge branch 'master' of ssh://og/simtrace2 .. Merge branch 'master' of ssh://og/simtrace2 Change-Id: Ie72fe5300d36290ce5fbdefbc963dac3f7b9f73c --- 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/76/17076/1 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/17076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ie72fe5300d36290ce5fbdefbc963dac3f7b9f73c Gerrit-Change-Number: 17076 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange
Change in simtrace2[master]: cardem: disable upload for simtrace2
Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/17077 ) Change subject: cardem: disable upload for simtrace2 .. cardem: disable upload for simtrace2 cardem on the st2 has been broken forever and still does not work, so stop uploading cardem binaries Change-Id: I0bf0c28dcca6a7478f6c8f413f015f4cbe6d9a54 --- M contrib/jenkins.sh 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/77/17077/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 3ed1345..7ddfa6e 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -63,6 +63,8 @@ # make -C "$base/doc/manuals" publish #fi +rm -rf $TOPDIR/firmware/bin/simtrace-cardem* + if [ "x$publish" = "x--publish" ]; then echo echo "=== UPLOAD BUILD ==" -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/17077 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I0bf0c28dcca6a7478f6c8f413f015f4cbe6d9a54 Gerrit-Change-Number: 17077 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: hlr: add TC_MSLookup_mDNS_service_other_home
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 ) Change subject: hlr: add TC_MSLookup_mDNS_service_other_home .. Patch Set 10: Test renamed for consistency with new tests in follow-up patches. -- 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: 10 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 30 Jan 2020 15:53:26 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: hlr: add TC_MSLookup_GSUP_proxy
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17064 to look at the new patch set (#4). Change subject: hlr: add TC_MSLookup_GSUP_proxy .. hlr: add TC_MSLookup_GSUP_proxy Let OsmoHLR act as proxy between MSC and home HLR during Location update. Related: OS#4380 Change-Id: I945e651f1346e56dbe3c02d9d08ccd95cc8d6626 --- M hlr/HLR_Tests.ttcn M hlr/gen_links.sh M library/MSLookup_mDNS_Templates.ttcn 3 files changed, 148 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/64/17064/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17064 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: I945e651f1346e56dbe3c02d9d08ccd95cc8d6626 Gerrit-Change-Number: 17064 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: neels Gerrit-MessageType: newpatchset
Change in osmo-ttcn3-hacks[master]: hlr: add TC_MSLookup_mDNS_service_other_home
Hello pespin, fixeria, laforge, 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 (#10). Change subject: hlr: add TC_MSLookup_mDNS_service_other_home .. hlr: add TC_MSLookup_mDNS_service_other_home Send an mslookup mDNS request to the home HLR, asking about a service that is not "gsup.hlr". Hence the "_other" in the test name, service "gsup.hlr" has different code paths, and related tests will be added in follow-up patches. This is the first test using MSLookup_mDNS_Emulation, so add related test infrastructure. Related: OS#4380 Depends: osmo-hlr I2fe453553c90e6ee527ed13a13089900efd488aa 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, 275 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/14/16914/10 -- 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: 10 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-ttcn3-hacks[master]: hlr: add TC_MSLookup_mDNS_service_other_proxy
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17075 )
Change subject: hlr: add TC_MSLookup_mDNS_service_other_proxy
..
hlr: add TC_MSLookup_mDNS_service_other_proxy
Ask proxy HLR about configured sip.voice service, and expect result.
Related: OS#4380
Change-Id: I2c956119783972b5e6828bed7554a8a79984d8a2
---
M hlr/HLR_Tests.ttcn
1 file changed, 43 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/75/17075/1
diff --git a/hlr/HLR_Tests.ttcn b/hlr/HLR_Tests.ttcn
index e00bd8b..0dd3cad 100644
--- a/hlr/HLR_Tests.ttcn
+++ b/hlr/HLR_Tests.ttcn
@@ -1799,6 +1799,48 @@
}
}
+/* Ask proxy HLR about configured sip.voice service, and expect result. */
+private function f_TC_MSLookup_mDNS_service_other_proxy() runs on HLR_ConnHdlr
{
+ timer T;
+ var integer id := f_rnd_int(65535); /* mDNS packet ID */
+ var charstring domain := "sip.voice." & hex2str(g_pars.sub.msisdn) &
".msisdn.mdns.osmocom.org";
+
+ f_perform_UL_proxy(g_pars.sub.imsi, g_pars.sub.msisdn,
OSMO_GSUP_CN_DOMAIN_CS);
+
+ /* Send mDNS query, expect result */
+ mDNS.send(ts_MSLookup_mDNS_query(id, domain));
+ T.start(1.0);
+ alt {
+ [] mDNS.receive(tr_MSLookup_mDNS_result_IPv4(id, domain,
f_enc_IPv4("66.66.66.66"), 5060)) {
+ setverdict(pass);
+ }
+ [] mDNS.receive(MSLookup_mDNS:?) {
+ repeat;
+ }
+ [] T.timeout {
+ setverdict(fail, "Timeout");
+ }
+ }
+}
+testcase TC_MSLookup_mDNS_service_other_proxy() runs on test_CT {
+ var hexstring imsi := f_rnd_imsi('26242'H);
+ var hexstring msisdn := '49161'H & f_rnd_hexstring(7, 9);
+ var HLR_ConnHdlr vc_conn;
+ var HLR_ConnHdlrPars pars := valueof(t_Pars(imsi, msisdn));
+
+ f_init(false, true);
+ f_vty_config(VTY, "mslookup", "mdns bind");
+ f_vty_config2(VTY, {"mslookup", "server"}, "service sip.voice at
66.66.66.66 5060");
+ vc_conn :=
f_start_handler(refers(f_TC_MSLookup_mDNS_service_other_proxy), pars, true);
+
+ timer T := 3.0;
+ T.start;
+ alt {
+ [] vc_conn.done {}
+ [] T.timeout { setverdict(fail, "Timeout"); mtc.stop; };
+ }
+}
+
/* TODO:
* UL with ISD error
* UL with ISD timeout
@@ -1850,6 +1892,7 @@
execute( TC_MSLookup_GSUP_proxy() );
execute( TC_MSLookup_mDNS_service_GSUP_HLR_home() );
execute( TC_MSLookup_mDNS_service_GSUP_HLR_proxy() );
+ execute( TC_MSLookup_mDNS_service_other_proxy() );
}
};
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17075
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: I2c956119783972b5e6828bed7554a8a79984d8a2
Gerrit-Change-Number: 17075
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-MessageType: newchange
Change in pysim[master]: Fix file permission
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16942 ) Change subject: Fix file permission .. Patch Set 4: > Patch Set 4: > > > Patch Set 4: Code-Review+2 > > A quick question regarding the merging of patches, am I supposed to merge > these changes or the reviewers will merge them? If it is the former, could > someone please let me know how to do it? > > Many thanks!! We usually follow these rules: https://osmocom.org/projects/cellular-infrastructure/wiki/Gerrit/#Voting-Rules-for-merging-a-patch-to-master. As soon as your change and *its predecessors* get at least CR+1+2, you can merge it yourself (Submit button is what you're looking for). If you don't have time, I could take care about this patch set on holidays. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I893869329e9547e06386baf4d16a18e545042d62 Gerrit-Change-Number: 16942 Gerrit-PatchSet: 4 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 30 Jan 2020 15:38:55 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in pysim[master]: Fix file permission
herlesupreeth has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16942 ) Change subject: Fix file permission .. Patch Set 4: > Patch Set 4: Code-Review+2 A quick question regarding the merging of patches, am I supposed to merge these changes or the reviewers will merge them? If it is the former, could someone please let me know how to do it? Many thanks!! -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I893869329e9547e06386baf4d16a18e545042d62 Gerrit-Change-Number: 16942 Gerrit-PatchSet: 4 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 30 Jan 2020 12:22:12 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in pysim[master]: Fixed update_hplmn_act method
Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16945 to look at the new patch set (#7). Change subject: Fixed update_hplmn_act method .. Fixed update_hplmn_act method Change-Id: I35848059d6082c379246c8d695cb094c20780d15 --- M pySim/cards.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/45/16945/7 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I35848059d6082c379246c8d695cb094c20780d15 Gerrit-Change-Number: 16945 Gerrit-PatchSet: 7 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-MessageType: newpatchset
Change in osmo-hlr[master]: D-GSM 3/n: implement roaming by mslookup in osmo-hlr
osmith has uploaded a new patch set (#23) to the change originally created by neels. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16258 ) Change subject: D-GSM 3/n: implement roaming by mslookup in osmo-hlr .. D-GSM 3/n: implement roaming by mslookup in osmo-hlr Add mslookup client to find remote home HLRs of unknown IMSIs, and proxy/forward GSUP for those to the right remote HLR instances. Add remote_hlr.c to manage one GSUP client per remote HLR GSUP address. Add proxy.c to keep state about remotely handled IMSIs (remote GSUP address, MSISDN, and probably more in future patches). The mslookup_server that determines whether a given MSISDN is attached locally now also needs to look in the proxy record: it is always the osmo-hlr immediately peering for the MSC that should respond to mslookup service address queries like SIP and SMPP. (Only gsup.hlr service is always answered by the home HLR.) Add dgsm.c to set up an mdns mslookup client, ask for IMSI homes, and to decide which GSUP is handled locally and which needs to go to a remote HLR. Add full VTY config and VTY tests. For a detailed overview of the D-GSM and mslookup related files, please see the elaborate comment at the top of mslookup.c (already added in an earlier patch). Change-Id: I2fe453553c90e6ee527ed13a13089900efd488aa --- M include/osmocom/hlr/Makefile.am A include/osmocom/hlr/dgsm.h M include/osmocom/hlr/gsup_server.h M include/osmocom/hlr/hlr.h M include/osmocom/hlr/hlr_vty.h M include/osmocom/hlr/logging.h M include/osmocom/hlr/mslookup_server.h A include/osmocom/hlr/proxy.h A include/osmocom/hlr/remote_hlr.h M src/Makefile.am A src/dgsm.c M src/dgsm_vty.c M src/gsup_server.c M src/hlr.c M src/hlr_vty.c M src/logging.c M src/mslookup_server.c A src/proxy.c A src/remote_hlr.c M tests/gsup_server/Makefile.am M tests/test_nodes.vty 21 files changed, 2,005 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/58/16258/23 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I2fe453553c90e6ee527ed13a13089900efd488aa Gerrit-Change-Number: 16258 Gerrit-PatchSet: 23 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-hlr[master]: D-GSM 1/n: add mslookup server in osmo-hlr
osmith has uploaded a new patch set (#31) to the change originally created by neels. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16209 ) Change subject: D-GSM 1/n: add mslookup server in osmo-hlr .. D-GSM 1/n: add mslookup server in osmo-hlr Implement the mslookup server to service remote mslookup requests. This patch merely adds the logic to answer incoming mslookup requests, an actual method to receive requests (mDNS) follows in a subsequent patch. - API to configure service names and addresses for the local site (per MSC). - determine whether a subscriber is on a local MSC (checking the local proxy will be added in subsequent patch that adds proxy capability). - VTY config follows in a subsequent patch. For a detailed overview of the D-GSM and mslookup related files, please see the elaborate comment at the top of mslookup.c (already added in an earlier patch). Change-Id: Ife4a61d71926d08f310a1aeed9d9f1974f64178b --- M include/osmocom/hlr/Makefile.am M include/osmocom/hlr/hlr.h A include/osmocom/hlr/mslookup_server.h A include/osmocom/hlr/timestamp.h M src/Makefile.am M src/hlr.c A src/mslookup_server.c A src/timestamp.c 8 files changed, 537 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/09/16209/31 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ife4a61d71926d08f310a1aeed9d9f1974f64178b Gerrit-Change-Number: 16209 Gerrit-PatchSet: 31 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in simtrace2[master]: remsim: allow selecting pcsc reader number
Hoernchen has submitted this change. (
https://gerrit.osmocom.org/c/simtrace2/+/17059 )
Change subject: remsim: allow selecting pcsc reader number
..
remsim: allow selecting pcsc reader number
The number can be queried using pcsc_scan -n
Change-Id: I9d347501a9f181f68e74799ad04a810553eb2c9e
---
M host/src/simtrace2-remsim.c
1 file changed, 8 insertions(+), 2 deletions(-)
Approvals:
daniel: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/host/src/simtrace2-remsim.c b/host/src/simtrace2-remsim.c
index 7d5ecd3..201ff71 100644
--- a/host/src/simtrace2-remsim.c
+++ b/host/src/simtrace2-remsim.c
@@ -182,6 +182,7 @@
"\t-i\t--gsmtap-ip\tA.B.C.D\n"
"\t-a\t--skip-atr\n"
"\t-k\t--keep-running\n"
+ "\t-n\t--pcsc-reader-num\n"
"\t-V\t--usb-vendor\tVENDOR_ID\n"
"\t-P\t--usb-product\tPRODUCT_ID\n"
"\t-C\t--usb-config\tCONFIG_ID\n"
@@ -200,6 +201,7 @@
{ "skip-atr", 0, 0, 'a' },
{ "help", 0, 0, 'h' },
{ "keep-running", 0, 0, 'k' },
+ { "pcsc-reader-num", 1, 0, 'n' },
{ "usb-vendor", 1, 0, 'V' },
{ "usb-product", 1, 0, 'P' },
{ "usb-config", 1, 0, 'C' },
@@ -285,6 +287,7 @@
int remote_udp_port = 52342;
int if_num = 0, vendor_id = -1, product_id = -1;
int config_id = -1, altsetting = 0, addr = -1;
+ int reader_num = 0;
char *remote_udp_host = NULL;
char *path = NULL;
struct osim_reader_hdl *reader;
@@ -295,7 +298,7 @@
while (1) {
int option_index = 0;
- c = getopt_long(argc, argv, "r:p:hi:V:P:C:I:S:A:H:ak", opts,
_index);
+ c = getopt_long(argc, argv, "r:p:hi:V:P:C:I:S:A:H:akn:", opts,
_index);
if (c == -1)
break;
switch (c) {
@@ -318,6 +321,9 @@
case 'k':
keep_running = 1;
break;
+ case 'n':
+ reader_num = atoi(optarg);
+ break;
case 'V':
vendor_id = strtol(optarg, NULL, 16);
break;
@@ -373,7 +379,7 @@
goto close_exit;
}
- reader = osim_reader_open(OSIM_READER_DRV_PCSC, 0, "", NULL);
+ reader = osim_reader_open(OSIM_READER_DRV_PCSC, reader_num, "", NULL);
if (!reader) {
perror("unable to open PC/SC reader");
goto close_exit;
--
To view, visit https://gerrit.osmocom.org/c/simtrace2/+/17059
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: simtrace2
Gerrit-Branch: master
Gerrit-Change-Id: I9d347501a9f181f68e74799ad04a810553eb2c9e
Gerrit-Change-Number: 17059
Gerrit-PatchSet: 2
Gerrit-Owner: Hoernchen
Gerrit-Reviewer: Hoernchen
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: tsaitgaist
Gerrit-MessageType: merged
Change in libosmocore[master]: pcsc: don't leak memory
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/17058 ) Change subject: pcsc: don't leak memory .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/17058 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I183882ff2eae82754d55189b154863fad9cce4aa Gerrit-Change-Number: 17058 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Thu, 30 Jan 2020 10:21:15 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in simtrace2[master]: remsim: allow selecting pcsc reader number
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/17059 ) Change subject: remsim: allow selecting pcsc reader number .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/17059 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I9d347501a9f181f68e74799ad04a810553eb2c9e Gerrit-Change-Number: 17059 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: tsaitgaist Gerrit-Comment-Date: Thu, 30 Jan 2020 10:16:45 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in simtrace2[master]: remsim: allow selecting pcsc reader number
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/17059 ) Change subject: remsim: allow selecting pcsc reader number .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/17059 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I9d347501a9f181f68e74799ad04a810553eb2c9e Gerrit-Change-Number: 17059 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: tsaitgaist Gerrit-Comment-Date: Thu, 30 Jan 2020 09:53:10 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-hlr[master]: gsup client: add up_down_cb(), add osmo_gsup_client_create3()
fixeria has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-hlr/+/16206 )
Change subject: gsup client: add up_down_cb(), add osmo_gsup_client_create3()
..
Patch Set 28: Code-Review+1
(2 comments)
https://gerrit.osmocom.org/c/osmo-hlr/+/16206/28/include/osmocom/gsupclient/gsup_client.h
File include/osmocom/gsupclient/gsup_client.h:
https://gerrit.osmocom.org/c/osmo-hlr/+/16206/28/include/osmocom/gsupclient/gsup_client.h@62
PS28, Line 62: osmo_gsup_client_config
That's a nice idea to finally group all parameters into a structure!
https://gerrit.osmocom.org/c/osmo-hlr/+/16206/28/include/osmocom/gsupclient/gsup_client.h@69
PS28, Line 69: tcp_port
Just an idea: what if somebody wants to use a different transport layer, e.g.
SCTP? We could make the new function more flexible by adding an enumerated type
(osmo_gsup_transport_proto?) and a union to this structure:
...
enum osmo_gsup_transport_proto transport_proto;
const char *ip_addr;
union {
struct tcp_ipa {
struct ipaccess_unit *ipa_dev;
unsigned int port;
}
} u;
...
For now osmo_gsup_client_create3() would return -ENOTSUPP for transport_proto
!= TCP_IPA.
--
To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16206
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hlr
Gerrit-Branch: master
Gerrit-Change-Id: I6f181e42b678465bc9945f192559dc57d2083c6d
Gerrit-Change-Number: 16206
Gerrit-PatchSet: 28
Gerrit-Owner: neels
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-Comment-Date: Thu, 30 Jan 2020 09:51:16 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: hlr: new test: TC_MSLookup_GSUP_proxy
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17064 ) Change subject: hlr: new test: TC_MSLookup_GSUP_proxy .. Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17064/1/hlr/HLR_Tests.ttcn File hlr/HLR_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17064/1/hlr/HLR_Tests.ttcn@1663 PS1, Line 1663: > maybe add comment: […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17064 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: I945e651f1346e56dbe3c02d9d08ccd95cc8d6626 Gerrit-Change-Number: 17064 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: neels Gerrit-Comment-Date: Thu, 30 Jan 2020 09:45:18 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: hlr: new test: TC_MSLookup_GSUP_proxy
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17064 to look at the new patch set (#3). Change subject: hlr: new test: TC_MSLookup_GSUP_proxy .. hlr: new test: TC_MSLookup_GSUP_proxy Let OsmoHLR act as proxy between MSC and another HLR during Location Update. Related: OS#4380 Change-Id: I945e651f1346e56dbe3c02d9d08ccd95cc8d6626 --- M hlr/HLR_Tests.ttcn M hlr/gen_links.sh M library/MSLookup_mDNS_Templates.ttcn 3 files changed, 142 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/64/17064/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17064 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: I945e651f1346e56dbe3c02d9d08ccd95cc8d6626 Gerrit-Change-Number: 17064 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: neels Gerrit-MessageType: newpatchset
Change in osmo-hlr[master]: mslookup_client_mdns_test: disable by default
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/17071 ) Change subject: mslookup_client_mdns_test: disable by default .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/17071 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ie0cd4b0c55a1fbb00c215aeec7dcd0c15805add3 Gerrit-Change-Number: 17071 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 30 Jan 2020 09:36:49 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-hlr[master]: mslookup_client_mdns_test: no automatic skip
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-hlr/+/17072 )
Change subject: mslookup_client_mdns_test: no automatic skip
..
mslookup_client_mdns_test: no automatic skip
Exit with error code if multicast is disabled. The test is disabled by
default already, so when explicitly enabling it, we should not
automatically skip it.
Related: OS#4385
Change-Id: I82022c23fa9c40535f922b12d917efd7e229912b
---
M tests/mslookup/mslookup_client_mdns_test.c
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/72/17072/1
diff --git a/tests/mslookup/mslookup_client_mdns_test.c
b/tests/mslookup/mslookup_client_mdns_test.c
index f33ef98..5e558b4 100644
--- a/tests/mslookup/mslookup_client_mdns_test.c
+++ b/tests/mslookup/mslookup_client_mdns_test.c
@@ -225,8 +225,8 @@
int main()
{
if (!is_multicast_enabled()) {
- fprintf(stderr, "WARNING: multicast is disabled, skipping the
test! (OS#4361)");
- return 77;
+ fprintf(stderr, "ERROR: multicast is disabled! (OS#4361)");
+ return 1;
}
talloc_enable_null_tracking();
--
To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/17072
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hlr
Gerrit-Branch: master
Gerrit-Change-Id: I82022c23fa9c40535f922b12d917efd7e229912b
Gerrit-Change-Number: 17072
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-MessageType: newchange
Change in osmo-hlr[master]: mslookup_client_mdns_test: disable by default
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/17071 ) Change subject: mslookup_client_mdns_test: disable by default .. mslookup_client_mdns_test: disable by default Only build and run the test, if --enable-mslookup-client-mdns-test is passed to ./configure. Enable that option in jenkins.sh. Related: OS#4385 Change-Id: Ie0cd4b0c55a1fbb00c215aeec7dcd0c15805add3 --- M configure.ac M contrib/jenkins.sh M tests/mslookup/Makefile.am M tests/testsuite.at 4 files changed, 29 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/71/17071/1 diff --git a/configure.ac b/configure.ac index 59261e8..34c5163 100644 --- a/configure.ac +++ b/configure.ac @@ -107,6 +107,15 @@ AC_MSG_RESULT([$enable_ext_tests]) AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes") +# mslookup_client_mdns_test (OS#4385: does not work everywhere) +AC_ARG_ENABLE([mslookup_client_mdns_test], + AC_HELP_STRING([--enable-mslookup-client-mdns-test], + [Include the mslookup_client_mdns_test in make check [default=no]]), + [enable_mslookup_client_mdns_test="$enableval"],[enable_mslookup_client_mdns_test="no"]) +AC_MSG_CHECKING([whether to enable mslookup_client_mdns_test]) +AC_MSG_RESULT([$enable_mslookup_client_mdns_test]) +AM_CONDITIONAL(ENABLE_MSLOOKUP_CLIENT_MDNS_TEST, test "x$enable_mslookup_client_mdns_test" = "xyes") + # Generate manuals AC_ARG_ENABLE(manuals, [AS_HELP_STRING( diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 5914182..522d72e 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -49,7 +49,12 @@ cd "$base" autoreconf --install --force -./configure --enable-sanitize --enable-external-tests --enable-werror $CONFIG +./configure \ + --enable-sanitize \ + --enable-external-tests \ + --enable-mslookup-client-mdns-test \ + --enable-werror \ + $CONFIG $MAKE $PARALLEL_MAKE $MAKE check || cat-testlogs.sh DISTCHECK_CONFIGURE_FLAGS="$CONFIG" $MAKE distcheck || cat-testlogs.sh diff --git a/tests/mslookup/Makefile.am b/tests/mslookup/Makefile.am index ebf2add..04778e8 100644 --- a/tests/mslookup/Makefile.am +++ b/tests/mslookup/Makefile.am @@ -24,7 +24,6 @@ check_PROGRAMS = \ mdns_test \ - mslookup_client_mdns_test \ mslookup_client_test \ mslookup_test \ $(NULL) @@ -45,14 +44,6 @@ $(LIBOSMOGSM_LIBS) \ $(NULL) -mslookup_client_mdns_test_SOURCES = \ - mslookup_client_mdns_test.c \ - $(NULL) -mslookup_client_mdns_test_LDADD = \ - $(top_builddir)/src/mslookup/libosmo-mslookup.la \ - $(LIBOSMOGSM_LIBS) \ - $(NULL) - mdns_test_SOURCES = \ mdns_test.c \ $(NULL) @@ -61,6 +52,18 @@ $(LIBOSMOGSM_LIBS) \ $(NULL) +if ENABLE_MSLOOKUP_CLIENT_MDNS_TEST +check_PROGRAMS += mslookup_client_mdns_test + +mslookup_client_mdns_test_SOURCES = \ + mslookup_client_mdns_test.c \ + $(NULL) +mslookup_client_mdns_test_LDADD = \ + $(top_builddir)/src/mslookup/libosmo-mslookup.la \ + $(LIBOSMOGSM_LIBS) \ + $(NULL) +endif + .PHONY: update_exp update_exp: for i in $(check_PROGRAMS); do \ diff --git a/tests/testsuite.at b/tests/testsuite.at index 827e9f8..d30b5e9 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -58,7 +58,9 @@ AT_CHECK([$abs_top_builddir/tests/mslookup/mslookup_client_test], [0], [ignore], [experr]) AT_CLEANUP +# AT_SKIP_IF: disable without --enable-mslookup-client-mdns-test (OS#4385) AT_SETUP([mslookup_client_mdns]) +AT_SKIP_IF([! test -e $abs_top_builddir/tests/mslookup/mslookup_client_mdns_test ]) AT_KEYWORDS([mslookup_client_mdns]) cat $abs_srcdir/mslookup/mslookup_client_mdns_test.err > experr AT_CHECK([$abs_top_builddir/tests/mslookup/mslookup_client_mdns_test], [0], [ignore], [experr]) -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/17071 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ie0cd4b0c55a1fbb00c215aeec7dcd0c15805add3 Gerrit-Change-Number: 17071 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
